From 674da273486630db7fc99a5021b4237d38e8f2e2 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Sun, 4 Aug 2024 10:54:03 +0200 Subject: [PATCH] Reduce 3rd party dependencies --- NOTICES | 511 +----------------- .../DeploymentRuntime/category.xml | 6 - .../birt-packages/birt-runtime-osgi/build.xml | 9 - build/org.eclipse.birt.releng/BIRT.setup | 2 +- .../org.eclipse.birt.target.target | 5 +- .../WebContent/notes.html | 20 - .../META-INF/MANIFEST.MF | 1 - .../data/oda/mongodb/impl/MDbResultSet.java | 11 +- .../META-INF/MANIFEST.MF | 2 - .../oda/excel/impl/util/XlsxFileReader.java | 19 +- .../META-INF/MANIFEST.MF | 2 +- pom.xml | 4 - .../Build_Web_Viewer_Instruction.txt | 18 - .../META-INF/MANIFEST.MF | 1 - 14 files changed, 15 insertions(+), 596 deletions(-) delete mode 100644 chart/org.eclipse.birt.chart.viewer/WebContent/notes.html delete mode 100644 viewer/org.eclipse.birt.report.viewer/Build_Web_Viewer_Instruction.txt diff --git a/NOTICES b/NOTICES index fce698907ec..8a0ac61c7d8 100644 --- a/NOTICES +++ b/NOTICES @@ -34,516 +34,7 @@ The project maintains the following source code repositories: ## Third-party Content -This project leverages the following third party content. - -Apache Axis (1.3) - -* License: Apache License, 2.0 - -Apache Axis.jar (1.4) - -* License: Apache License, 2.0 - -Apache Batik DOM Component (1.6.1) - -* License: Apache License, 2.0, W3C License, Public Domain - -Apache Batik SVG Toolkit (1.6.0) - -* License: Apache License, 2.0 - -Apache Common Codec (1.5) - -* License: Apache License 2.0 -* Project: http://commons.apache.org/proper/commons-codec/ -* Source: http://commons.apache.org/proper/commons-codec/download_codec.cgi - -Apache Commons Codec (1.3) - -* License: Apache License, 2.0 - -Apache Commons Line interface (1.0) - -* License: Apache Software License 1.1 - -Apache Commons Logging (1.0.3) - -* License: Apache License, 2.0 - -Apache Commons Logging (1.0.4) - -* License: Apache License, 2.0 - -Apache Commons Math (2.1.0) - -* License: Apache License, 2.0, New BSD license - -Apache Derby (10.0.2) - -* License: Apache License, 2.0 - -Apache Derby (10.1.2.1) - -* License: Apache License, 2.0 - -Apache Derby (10.5.1.1) - -* License: Apache License, 2.0 - -Apache Derby (10.8.2.2) - -* License: Apache License, 2.0 - -Apache FOP (Formatting Objects Processor) (0.20.5) - -* License: Apache License, 2.0 - -Apache Log4J (1.2.8) - -* License: Apache License, 2.0 - -Apache PDF Version: Transcoder.Jar ( Included with Batik (1.6) - -* License: Apache License, 2.0 - -Apache POI (3.9) - -* License: Apache License, 2.0 - -Apache POI (3.9) - -* License: Apache License, 2.0 - -Apache POI (4.1.1) - -* License: Apache-2.0 AND MIT AND EPL-1.0 AND BSD-3-Clause - -Apache poi-ooxml (3.7) - -* License: Apache License, 2.0 - -Apache poi-ooxml (3.9) - -* License: Apache License 2.0 - -Apache poi-ooxml-schemas (3.9) - -* License: Apache License 2.0 - -Apache Xerces J (2.6.2) - -* License: Apache License, 2.0 - -Apache Xerces J (2.8.0) - -* License: Apache License, 2.0 - -Apache XMLBeans (2.3) - -* License: Apache License, 2.0 - -Apache XMLBeans (2.3) - -* License: Apache License, 2.0 - -Batik animation library (1.7) - -* License: Apache License, 2.0 - -Batik bridge library (1.7) - -* License: Apache License, 2.0 - -Batik CSS engine library (1.7) - -* License: Apache License, 2.0 - -Batik DOM Level 3 implementation library (1.7) - -* License: Apache License, 2.0, W3C License - -Batik extensions library (1.7) - -* License: Apache License, 2.0 - -Batik extensions library (1.13) - -* License: Apache-2.0 - -Batik external code library (1.7) - -* License: Apache License, 2.0 - -Batik GUI utility library (1.7) - -* License: Apache License, 2.0 - -Batik image codecs library (1.7) - -* License: Apache License, 2.0 - -Batik parser library (1.7) - -* License: Apache License, 2.0 - -Batik script library (1.7) - -* License: Apache License, 2.0 - -Batik SVG DOM implementation (1.7) - -* License: Apache License, 2.0, W3C License, Historical Permission Notice - (without Disclaimer) - -Batik Swing components library (1.7) - -* License: Apache License, 2.0 - -Batik transcoder library (1.7) - -* License: Apache License, 2.0 - -Batik transcoder library (1.11) - -* License: Apache-2.0 - -Batik utility library (1.7) - -* License: Apache License, 2.0 - -Batik XML utility library (1.7) - -* License: Apache License, 2.0 - -commons-discovery-0.2.jar (0.2) - -* License: Apache Software License 1.1 - -CSS SAC (Simple API for CSS 1.3) (1.3) - -* License: Apache License, 2.0, W3C License - -Derby (10.3.1.4) - -* License: Apache License, 2.0 - -Derby (10.11.1.1) - -* License: Apache License, 2.0 - -DOM SMIL Animation Java Binding (from Batik (1.6) - -* License: W3C License - -DOM SVG Animation Java Binding (from Batik (1.6) - -* License: W3C License - -dom4j (1.6.1) - -* License: Custom license based on Apache 1.1 - -dom4j (1.6.1) - -* License: Custom License Based on Apache 1.1 - -Exolab Castor XML (0.9.5.4) - -* License: Intalio license (modified Apache 1.1 style) - -Flute (1.3) - -* License: W3C License - -head.js (0.99) - -* License: MIT License -* Project: http://headjs.com -* Source: https://github.com/headjs/headjs - -icu4j (50.1.1) - -* License: MIT Style with "no endorsement" clause, Unicode license - -ICU4J 49.1 (49.1) - -* License: MIT Style with "no endorsement" clause, Unicode license -* Project: http://site.icu-project.org/ -* Source: http://site.icu-project.org/download/49#TOC-ICU4J-Download - -ICU4J and ICU4J replacement (4.0.1) - -* License: MIT license with no endorsement clause, Unicode license - -itext 2.1.7 (2.1.7) - -* License: Dual MPL / GPL (choose MPL); Modified BSD, MIT Style with "no - endorsement" clause; Apache 2.0; Adobe Open Source License (custom); Unicode - License (based on MIT); Bouncy Castle License (based on MIT), Creative - Commons Attribution License 2.5 -* Project: http://www.lowagie.com/iText/ -* Source: http://1t3xt.com/downloads/source/ - -iText PDF library (1.5.2) - -* License: Mozilla Public License 1.1 (MPL) - -iText PDF library (1.5.3) - -* License: Mozilla Public License 1.1 (MPL) (Dual LGPL / MPL: choose MPL) + - Apache 2.0, + New BSD, + Unicode license (MIT Style) - -iText PDF library (1.5.4) - -* License: Dual MPL / GPL (choose MPL); Modified BSD, MIT Style with "no - endorsement" clause; Apache 2.0; Adobe Open Source License (custom); Unicode - License (based on MIT); Bouncy Castle License (based on MIT) - -iTextAsian.Jar (1.5.2) - -* License: Mozilla Public License 1.1 (MPL) - -jax rpc (1.1) - -* License: Common Development and Distribution License - -jQuery (1.4.1) - -* License: MIT License - -jQuery UI (1.8.16) - -* License: MIT license -* Project: http://jqueryui.com/ -* Source: http://jqueryui.com/download/jquery-ui-1.7.3.custom.zip - -json.org java impl of json parser Version: 2008-09-18 (n/a) - -* License: MIT License - -JTidy.jar Version: 04aug2000r7-dev (n/a) - -* License: Jtidy License (MIT Style) - -JTidy.jar Version: r938 (n/a) - -* License: LicenseRef-Jtidy -* Project: http://jtidy.sourceforge.net/ -* Source: - http://central.maven.org/maven2/net/sf/jtidy/jtidy/r938/jtidy-r938.jar - -Junit (3.8.1) - -* License: Common Public License 1.0 - -log4j 1.2.13 (1.2.13) - -* License: Apache License, 2.0 - -log4j-api (2.8.2) - -* License: Apache-2.0 - -MongoDB Java Driver (2.10.1) - -* License: Apache License, 2.0 -* Project: http://www.mongodb.org/ -* Source: https://github.com/mongodb/mongo-java-driver/ - -mongodb java driver (3.2.0) - -* License: Apache License, 2.0, Creative Commons Attribution License 2.5, - Public Domain - -mongodb java driver (3.2.0) - -* License: Apache License, 2.0, Creative Commons Attribution License 2.5, - Public Domain - -Mongodb Java Driver to (3.2.2) - -* License: Apache License, 2.0, Creative Commons Attribution License 2.5, - Public Domain -* Project: https://docs.mongodb.org/ecosystem/drivers/java/ -* Source: - http://central.maven.org/maven2/org/mongodb/mongo-java-driver/3.2.2/mongo-java-driver-3.2.2-sources.jar - -Mozilla Rhino (1.6) - -* License: Mozilla Public License 1.1 (MPL) - -Mozilla Rhino (1.6) - -* License: Mozilla Public License 1.1 (MPL) - -Mozilla Rhino (1.7) - -* License: Mozilla Public License 2.0 (MPL), New BSD license - -Mozilla Rhino (1.7) - -* License: Mozilla Public License 2.0 (MPL - -Mozilla Rhino (1.7) - -* License: Mozilla Public License 2.0 (MPL), New BSD license - -Mozilla Rhino (1.7) - -* License: Mozilla Public License 1.1 (MPL) - -Mozilla Rhino (1.7) - -* License: New BSD license, Mozilla Public License 1.1 (MPL) - -org.apache.xmlgraphics:batik-anim:1.13.0 (1.13.0) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-awt-util:1.13 (1.13) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-bridge:1.13 (1.13) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-codecs:1.13 (1.13) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-dom:1.13 (1.13) - -* License: Apache-2.0 AND W3C - -org.apache.xmlgraphics:batik-ext:1.13 (1.13) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-gui-util:1.13 (1.13) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-gvt:1.13 (1.13) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-parser:1.13 (1.13) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-script:1.13 (1.13) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-shared-resources:1.13.0 (1.13.0) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-svg-dom:1.13 (1.13) - -* License: Apache-2.0 AND W3C - -org.apache.xmlgraphics:batik-transcoder:1.13 (1.13) - -* License: Apache-2.0 - -org.apache.xmlgraphics:batik-xml:1.13 (1.13) - -* License: Apache-2.0 - -org.apache.xmlgraphics:fop:2.6 (2.6) - -* License: Apache-2.0 AND MIT AND BSD-3-Clause AND W3C AND - LicenseRef-Public-Domain AND Zlib AND CC-BY-SA-2.5 AND LicenseRef-OFL-style - AND Adobe-Glyph AND Unicode-TOU AND OFL-1.1-no-RFN - -osgi.compendium (4.1.0) - -* License: Apache License, 2.0 - -POI (3.7) - -* License: Apache License, 2.0 -* Project: http://poi.apache.org/ -* Source: http://poi.apache.org/download.html - -poi (3.17) - -* License: Apache-2.0 AND MIT - -POI Version: OpenXML4J (n/a) - -* License: Apache License, 2.0 - -Prototype 1.7 (1.7) - -* License: MIT License - -prototype.js (1.4.0) - -* License: MIT license - -Resolver.Jar (1.1) - -* License: Apache Software License 1.1 - -resolver.jar (1.2) - -* License: Apache License, 2.0 - -Rhino (1.5) - -* License: Netscape Public License 1.1 (NPL) - -Rhino (1.6) - -* License: Netscape Public License 1.1 (NPL) - -saaj.jar (1.2) - -* License: Apache License, 2.0 - -serializer.jar (2.7.0) - -* License: Apache License, 2.0 -* Project: http://xml.apache.org/xalan-j/ -* Source: http://www.apache.org/dyn/closer.cgi/xml/xalan-j - -stax-api (1.0.1) - -* License: Apache License, 2.0 - -stax-api (1.0.1) - -* License: Apache License, 2.0 -* Project: http://geronimo.apache.org/ - -wsdl4j-1.5.1.jar (for Apache Axis (1.4) - -* License: Common Public License 1.0 - -xalan 2.7.1 top level jar (2.7.1) - -* License: Apache License, 2.0 - -xalan.jar (2.7.0) - -* License: Apache License, 2.0 -* Project: http://xml.apache.org/xalan-j/ -* Source: http://www.apache.org/dyn/closer.cgi/xml/xalan-j - -Xerces (2.9.0) - -* License: Apache License, 2.0 - -xerces 2.9.1 (2.9.1) - -* License: Apache License, 2.0 - -xml-apis.jar (1.3.04) - -* License: Apache License, 2.0, Public Domain, W3C +This project leverages third party content. ## Cryptography diff --git a/build/birt-packages/birt-charts/DeploymentRuntime/category.xml b/build/birt-packages/birt-charts/DeploymentRuntime/category.xml index 89bdc46640e..5e7bd9f0bf0 100644 --- a/build/birt-packages/birt-charts/DeploymentRuntime/category.xml +++ b/build/birt-packages/birt-charts/DeploymentRuntime/category.xml @@ -23,15 +23,9 @@ - - - - - - diff --git a/build/birt-packages/birt-runtime-osgi/build.xml b/build/birt-packages/birt-runtime-osgi/build.xml index 5c3a98da516..7d3856bb0b8 100644 --- a/build/birt-packages/birt-runtime-osgi/build.xml +++ b/build/birt-packages/birt-runtime-osgi/build.xml @@ -80,15 +80,6 @@ - diff --git a/build/org.eclipse.birt.releng/BIRT.setup b/build/org.eclipse.birt.releng/BIRT.setup index f809642606d..39eab7dd194 100644 --- a/build/org.eclipse.birt.releng/BIRT.setup +++ b/build/org.eclipse.birt.releng/BIRT.setup @@ -453,7 +453,7 @@ - org.eclipse.equinox.executable.feature.group,org.apache.xml.serializer + org.eclipse.equinox.executable.feature.group diff --git a/build/org.eclipse.birt.target/org.eclipse.birt.target.target b/build/org.eclipse.birt.target/org.eclipse.birt.target.target index 16d8f1bf41a..cfb2fd27750 100644 --- a/build/org.eclipse.birt.target/org.eclipse.birt.target.target +++ b/build/org.eclipse.birt.target/org.eclipse.birt.target.target @@ -1,6 +1,6 @@ - + @@ -64,7 +64,6 @@ - @@ -137,7 +136,7 @@ - + diff --git a/chart/org.eclipse.birt.chart.viewer/WebContent/notes.html b/chart/org.eclipse.birt.chart.viewer/WebContent/notes.html deleted file mode 100644 index 505c957eb91..00000000000 --- a/chart/org.eclipse.birt.chart.viewer/WebContent/notes.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - -Deployment notes - - -

Some notes for deployment in specific platforms.

-

WebSphere

-

Please remove org.apache.xml.serializer_*.jar from WEB-INF/lib.

-
-

WebLogic

-

Please remove org.apache.xerces_*.jar from WEB-INF/lib.

-
-

JBoss 5.0.0.CR2

-

Please remove org.apache.xerces_*.jar and org.apache.xml.serializer_*.jar from WEB-INF/lib.

-
- - \ No newline at end of file diff --git a/data/org.eclipse.birt.data.oda.mongodb/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data.oda.mongodb/META-INF/MANIFEST.MF index fad893f1bcc..9d30fe856a8 100644 --- a/data/org.eclipse.birt.data.oda.mongodb/META-INF/MANIFEST.MF +++ b/data/org.eclipse.birt.data.oda.mongodb/META-INF/MANIFEST.MF @@ -19,7 +19,6 @@ Bundle-ActivationPolicy: lazy Import-Package: com.mongodb;version="[3.2.2,4.0.0)", com.mongodb.client;version="3.2.2", com.mongodb.util;version="[3.2.2,4.0.0)", - javax.xml.bind;version="2.2.0", org.bson;version="3.2.2", org.bson.conversions;version="3.2.2", org.bson.types;version="3.2.2" diff --git a/data/org.eclipse.birt.data.oda.mongodb/src/org/eclipse/birt/data/oda/mongodb/impl/MDbResultSet.java b/data/org.eclipse.birt.data.oda.mongodb/src/org/eclipse/birt/data/oda/mongodb/impl/MDbResultSet.java index c020afa53ff..73f075239e9 100644 --- a/data/org.eclipse.birt.data.oda.mongodb/src/org/eclipse/birt/data/oda/mongodb/impl/MDbResultSet.java +++ b/data/org.eclipse.birt.data.oda.mongodb/src/org/eclipse/birt/data/oda/mongodb/impl/MDbResultSet.java @@ -27,8 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.xml.bind.DatatypeConverter; - import org.bson.Document; import org.bson.types.BSONTimestamp; import org.eclipse.birt.data.oda.mongodb.internal.impl.DriverUtil; @@ -703,7 +701,7 @@ private static Object tryConvertToBoolean(Object value) { private static Object tryConvertToBytes(String stringValue) { try { - return DatatypeConverter.parseBase64Binary(stringValue); + return Base64.getDecoder().decode(stringValue); } catch (Exception ex) { // DatatypeConverter could be un-initialized, // log and continue; note that Base64Codec#decode might be unavailable in some @@ -718,12 +716,7 @@ private static Object tryConvertToBytes(String stringValue) { } private static String convertToString(byte[] value) { - try { - return DatatypeConverter.printBase64Binary(value); - } catch (Exception ex) { - // DatatypeConverter could be un-initialized; retry with Base64Codec - return (new String(Base64.getEncoder().encode(value))); - } + return Base64.getEncoder().encodeToString(value); } private static void logFetchedFirstElementFromArray(String columnName, int arraySize) { diff --git a/data/org.eclipse.birt.report.data.oda.excel/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.excel/META-INF/MANIFEST.MF index 0acac1459f2..d6ba6457cc4 100644 --- a/data/org.eclipse.birt.report.data.oda.excel/META-INF/MANIFEST.MF +++ b/data/org.eclipse.birt.report.data.oda.excel/META-INF/MANIFEST.MF @@ -14,12 +14,10 @@ Export-Package: org.eclipse.birt.report.data.oda.excel, Require-Bundle: org.eclipse.core.runtime;bundle-version="3.23.0", org.eclipse.datatools.connectivity.oda;bundle-version="[3.3.0,4.0.0)", org.eclipse.datatools.connectivity.oda.profile;bundle-version="[3.2.0,4.0.0)", - org.apache.xml.serializer;bundle-version="[2.7.2,3.0.0)", org.apache.commons.commons-logging;bundle-version="[1.0.4,2.0.0)";resolution:=optional, org.apache.poi;bundle-version="[5.0.0,6.0.0)", org.apache.poi.ooxml;bundle-version="[5.0.0,6.0.0)", org.apache.poi.ooxml.schemas;bundle-version="[5.0.0,6.0.0)", - org.apache.xerces;bundle-version="2.9.0", org.eclipse.birt.core;bundle-version="4.13.0" Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy diff --git a/data/org.eclipse.birt.report.data.oda.excel/src/org/eclipse/birt/report/data/oda/excel/impl/util/XlsxFileReader.java b/data/org.eclipse.birt.report.data.oda.excel/src/org/eclipse/birt/report/data/oda/excel/impl/util/XlsxFileReader.java index 111c7d5946c..d332c145375 100644 --- a/data/org.eclipse.birt.report.data.oda.excel/src/org/eclipse/birt/report/data/oda/excel/impl/util/XlsxFileReader.java +++ b/data/org.eclipse.birt.report.data.oda.excel/src/org/eclipse/birt/report/data/oda/excel/impl/util/XlsxFileReader.java @@ -21,10 +21,13 @@ import java.util.Date; import java.util.LinkedHashMap; +import javax.xml.parsers.ParserConfigurationException; + import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.ss.usermodel.BuiltinFormats; +import org.apache.poi.util.XMLHelper; import org.apache.poi.xssf.eventusermodel.XSSFReader; import org.apache.poi.xssf.model.SharedStrings; import org.apache.poi.xssf.model.StylesTable; @@ -36,12 +39,10 @@ import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; -import org.xml.sax.helpers.XMLReaderFactory; import com.ibm.icu.text.SimpleDateFormat; public class XlsxFileReader { - final static String PARSER_CLASS_NAME = "org.apache.xerces.parsers.SAXParser"; //$NON-NLS-1$ final static String ROW_LIMIT_REACHED_EX_MSG = "Row Limit Reached"; //$NON-NLS-1$ final private XSSFReader reader; @@ -85,18 +86,14 @@ public void processSheet(String rid, XlsxRowCallBack callback, int xlsxRowsToRea private XMLReader getXMLReader() throws SAXException { try { - return XMLReaderFactory.createXMLReader(); - } catch (SAXException e) { - try { - return (XMLReader) Class.forName(PARSER_CLASS_NAME).newInstance(); - } catch (Exception e1) { - throw e; - } + return XMLHelper.newXMLReader(); + } catch (ParserConfigurationException e) { + throw new SAXException(e); } } - private XMLReader fetchSheetParser(StylesTable st, SharedStrings sst, XlsxRowCallBack callback, - int xlsxRowsToRead) throws SAXException { + private XMLReader fetchSheetParser(StylesTable st, SharedStrings sst, XlsxRowCallBack callback, int xlsxRowsToRead) + throws SAXException { XMLReader parser = getXMLReader(); ContentHandler handler = new SheetHandler(st, sst, callback, xlsxRowsToRead); parser.setContentHandler(handler); diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/META-INF/MANIFEST.MF index 43ed46a91bd..7958f48db06 100644 --- a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/META-INF/MANIFEST.MF +++ b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,5.0.0)", org.eclipse.datatools.connectivity.oda.profile;bundle-version="[3.2.6,4.0.0)", org.eclipse.birt.report.data.oda.jdbc;bundle-version="[3.7.2,5.0.0)";visibility:=reexport, org.eclipse.datatools.modelbase.sql.query;bundle-version="[1.1.1,2.0.0)", - org.eclipse.datatools.connectivity.sqm.core;bundle-version="[1.2.2,2.0.0)", + org.eclipse.datatools.connectivity.sqm.core;bundle-version="[1.2.2,2.0.0)";resolution:=optional, org.eclipse.datatools.connectivity.oda.consumer;bundle-version="[3.2.4,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/pom.xml b/pom.xml index 08d7bbdac73..cdd785447ff 100644 --- a/pom.xml +++ b/pom.xml @@ -320,11 +320,7 @@ ${tycho.version} - - - - diff --git a/viewer/org.eclipse.birt.report.viewer/Build_Web_Viewer_Instruction.txt b/viewer/org.eclipse.birt.report.viewer/Build_Web_Viewer_Instruction.txt deleted file mode 100644 index 2c385a62b0f..00000000000 --- a/viewer/org.eclipse.birt.report.viewer/Build_Web_Viewer_Instruction.txt +++ /dev/null @@ -1,18 +0,0 @@ -Following are the steps to generate a web viewer which can work in Standalone Tomcat: - -1. Before create a web viewer, make sure that DTP ODA binary is setup in your Eclipse - Please use the latest stable build of DTP, you can download it from http://www.eclipse.org/datatools/downloads.html - -2. Make sure org.apache.batik.pdf, org.apache.batik and org.apache.xerces plugins are checked out to your workspace. - They can be found in (part of map files) - plugin@org.apache.batik=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,,org.eclipse.gmf/plugins/org.apache.batik - plugin@org.apache.batik.pdf=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,,org.eclipse.gmf/plugins/org.apache.batik.pdf - plugin@org.apache.xerces=HEAD,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/xml/thirdparty/org.apache.xerces - -3. Use Ant Build to call Jar target in BuildWebViewer.xml to create web viewer framework - When build is successful, birt_web is created under root of viewer plugin, and web viewer framework is put under birt_web. - Make sure property 'eclipse.home' has been set value when running from ant. - -4. Download iText1.3 from http://prdownloads.sourceforge.net/itext/itext-1.3.jar, copy it to birt_web/WEB-INF/platform/plugins/com.lowagie.itext/lib folder - -5. After above steps, birt_web can be deployed in Tomcat diff --git a/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF index f9c13806fec..33ac15094a2 100644 --- a/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF +++ b/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF @@ -40,7 +40,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.birt.report.designer.ui;bundle-version="[2.5.1,5.0.0)";resolution:=optional, org.eclipse.birt.chart.engine;bundle-version="[2.2.0,5.0.0)";resolution:=optional, org.eclipse.birt.report.engine.dataextraction;bundle-version="[2.3.0,5.0.0)", - org.apache.xerces;bundle-version="[2.8.0,3.0.0)";resolution:=optional, org.eclipse.birt.report.item.crosstab.core;bundle-version="[2.2.0,5.0.0)";resolution:=optional, org.eclipse.birt.report.designer.core;bundle-version="4.13.0", org.eclipse.jetty.server;bundle-version="12.0.2",