From 733cf81a3bd5ec491db0ba521f06ee15785a54ff Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Wed, 6 Oct 2010 07:58:51 +0000 Subject: [PATCH] repackaged poi-contrib to poi-main and poi-examples, excluded contrib from build artifacts git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1004919 13f79535-47bb-0310-9956-ffa450edef68 --- build.xml | 112 +-------------- maven/mvn-deploy.sh | 2 +- maven/poi-contrib.pom | 81 ----------- .../poi/contrib/poibrowser/package.html | 127 ------------------ .../apache/poi/poifs}/poibrowser/Codec.java | 0 .../poifs}/poibrowser/DocumentDescriptor.java | 0 .../DocumentDescriptorRenderer.java | 0 .../ExtendableTreeCellRenderer.java | 0 .../poi/poifs}/poibrowser/POIBrowser.java | 0 .../poibrowser/PropertySetDescriptor.java | 0 .../PropertySetDescriptorRenderer.java | 0 .../poifs}/poibrowser/TreeReaderListener.java | 0 .../apache/poi/poifs}/poibrowser/Util.java | 0 .../apache/poi/hssf/util}/HSSFCellUtil.java | 0 .../apache/poi/hssf/util}/HSSFRegionUtil.java | 0 .../org/apache/poi/ss/util}/CellUtil.java | 2 +- .../org/apache/poi/ss/util}/RegionUtil.java | 0 .../apache/poi/util}/FontMetricsDumper.java | 0 18 files changed, 8 insertions(+), 316 deletions(-) delete mode 100644 maven/poi-contrib.pom delete mode 100644 src/contrib/src/org/apache/poi/contrib/poibrowser/package.html rename src/{contrib/src/org/apache/poi/contrib => examples/src/org/apache/poi/poifs}/poibrowser/Codec.java (100%) rename src/{contrib/src/org/apache/poi/contrib => examples/src/org/apache/poi/poifs}/poibrowser/DocumentDescriptor.java (100%) rename src/{contrib/src/org/apache/poi/contrib => examples/src/org/apache/poi/poifs}/poibrowser/DocumentDescriptorRenderer.java (100%) rename src/{contrib/src/org/apache/poi/contrib => examples/src/org/apache/poi/poifs}/poibrowser/ExtendableTreeCellRenderer.java (100%) rename src/{contrib/src/org/apache/poi/contrib => examples/src/org/apache/poi/poifs}/poibrowser/POIBrowser.java (100%) rename src/{contrib/src/org/apache/poi/contrib => examples/src/org/apache/poi/poifs}/poibrowser/PropertySetDescriptor.java (100%) rename src/{contrib/src/org/apache/poi/contrib => examples/src/org/apache/poi/poifs}/poibrowser/PropertySetDescriptorRenderer.java (100%) rename src/{contrib/src/org/apache/poi/contrib => examples/src/org/apache/poi/poifs}/poibrowser/TreeReaderListener.java (100%) rename src/{contrib/src/org/apache/poi/contrib => examples/src/org/apache/poi/poifs}/poibrowser/Util.java (100%) rename src/{contrib/src/org/apache/poi/hssf/usermodel/contrib => java/org/apache/poi/hssf/util}/HSSFCellUtil.java (100%) rename src/{contrib/src/org/apache/poi/hssf/usermodel/contrib => java/org/apache/poi/hssf/util}/HSSFRegionUtil.java (100%) rename src/{contrib/src/org/apache/poi/ss/usermodel/contrib => java/org/apache/poi/ss/util}/CellUtil.java (99%) rename src/{contrib/src/org/apache/poi/ss/usermodel/contrib => java/org/apache/poi/ss/util}/RegionUtil.java (100%) rename src/{contrib/src/org/apache/poi/contrib/metrics => java/org/apache/poi/util}/FontMetricsDumper.java (100%) diff --git a/build.xml b/build.xml index 4be3a289d4..26fde7a2f4 100644 --- a/build.xml +++ b/build.xml @@ -96,14 +96,6 @@ under the License. - - - - - - - - @@ -173,11 +165,6 @@ under the License. - - - - - @@ -238,8 +225,8 @@ under the License. Timestamp ${DSTAMP} The main targets of interest are: - clean Erase all build work products (ie. everything in the build directory) - - compile Compile all files from main, ooxml, contrib and scratchpad - - test Run all unit tests from main, ooxml, contrib and scratchpad + - compile Compile all files from main, ooxml and scratchpad + - test Run all unit tests from main, ooxml and scratchpad - jar Produce jar files - site Generate all documentation (Requires Apache Forrest) - dist Create a distribution (Requires Apache Forrest) @@ -258,9 +245,6 @@ under the License. - - - @@ -413,8 +397,8 @@ under the License. + compile-scratchpad, compile-examples" + description="Compiles the POI main classes, scratchpad and examples"/> @@ -473,31 +457,6 @@ under the License. - - - - - - - - - - - - - + @@ -637,41 +596,6 @@ under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -775,9 +699,6 @@ under the License. - - - @@ -785,7 +706,6 @@ under the License. - @@ -845,13 +765,6 @@ under the License. - - - - - - - @@ -908,11 +821,6 @@ under the License. - - - - @@ -946,11 +854,6 @@ under the License. - - - - @@ -967,7 +870,6 @@ under the License. - @@ -1087,7 +989,6 @@ under the License. - @@ -1105,7 +1006,6 @@ under the License. - diff --git a/maven/mvn-deploy.sh b/maven/mvn-deploy.sh index 507656b19f..e6cfbbbe94 100755 --- a/maven/mvn-deploy.sh +++ b/maven/mvn-deploy.sh @@ -46,7 +46,7 @@ M2_SCP=people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository VERSION=@VERSION@ DSTAMP=@DSTAMP@ -for artifactId in poi poi-scratchpad poi-contrib poi-ooxml poi-examples poi-ooxml-schemas +for artifactId in poi poi-scratchpad poi-ooxml poi-examples poi-ooxml-schemas do mvn gpg:sign-and-deploy-file -DrepositoryId=apache-releases -P apache-releases \ -Durl=$M2_REPOSITORY \ diff --git a/maven/poi-contrib.pom b/maven/poi-contrib.pom deleted file mode 100644 index 43984a24b6..0000000000 --- a/maven/poi-contrib.pom +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - 4.0.0 - org.apache.poi - poi-contrib - @VERSION@ - jar - Apache POI - http://poi.apache.org/ - Apache POI - Java API To Access Microsoft Format Files - - - - POI Users List - user-subscribe@poi.apache.org - user-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-user/ - - - POI Developer List - dev-subscribe@poi.apache.org - dev-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-dev/ - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Apache Software Foundation - http://www.apache.org/ - - - - - org.apache.poi - poi - @VERSION@ - - - commons-logging - commons-logging - 1.1 - runtime - - - log4j - log4j - 1.2.13 - runtime - - - - diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/package.html b/src/contrib/src/org/apache/poi/contrib/poibrowser/package.html deleted file mode 100644 index cf78c20808..0000000000 --- a/src/contrib/src/org/apache/poi/contrib/poibrowser/package.html +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - -
-

The POI Browser is a very simple Swing GUI tool that - displays the internal structure of a Microsoft Office file. It concentrates - on streams in the Horrible Property Set Format (HPSF). In order to - access these streams the POI Browser uses the package - org.apache.poi.hpsf.

- -

A file in Microsoft's Office format can be seen as a filesystem within a - file. For example, a Word document like sample.doc is just a - simple file from the operation system's point of view. However, internally - it is organized into various directories and files. For example, - sample.doc might consist of the three internal files (or - "streams", as Microsoft calls them) \001CompObj, - \005SummaryInformation, and WordDocument. (In these names - \001 and \005 denote the unprintable characters with the character codes 1 - and 5, respectively.) A more complicated Word file typically contains a - directory named ObjectPool with more directories and files nested - within it.

- -

The POI Browser makes these internal structures visible. It takes one or - more Microsoft files as input on the command line and shows directories and - files in a tree-like structure. On the top-level POI Browser displays the - (operating system) filenames. An internal file (i.e. a "stream" or a - "document") is shown with its name, its size and a hexadecimal dump of its - first bytes.

-
- -
-

Property Set Streams

- -

The POI Browser pays special attention to property set streams. For - example, the \005SummaryInformation stream contains information - like title and author of the document. The POI Browser opens every stream - in a POI filesystem. If it encounters a property set stream, it displays - not just its first bytes but analyses the whole stream and displays its - contents in a more or less readable manner.

-
- -
-

Running POI Browser

- -

Running the POI Browser requires you to start a Java Virtual Machine - (JVM) and to set up a valid classpath so that the JVM can find all the Java - classes it needs. These are the main POI classes and the "contrib" POI - classes.

- -

The following instructions assume that you have set up your Java - enviromnent variables properly, i.e. the variable JAVA_HOME contains the - name of your Java installation directory and the variable PATH includes the - bin subdirectory of the Java installation directory. At the time - of this writing the current POI version was 2.5.1-final dating from August - 4th, 2004. The example statements reflect version numbering and - date. Change the commands accordingly if you are running the POI Browser of - a later or earlier than this!

- -
-

Running POI Browser on Unix

- -

Suppose you have unpacked the POI 2.5.1 release in the - /opt/local/poi directory of your Unix box. Then the following - command starts the POI Browser and displays the structure of the files - MyWord.doc, MyExcel.xls and - MyPowerpoint.ppt:

- -
java -classpath /opt/local/poi/poi-2.5.1-final-20040804.jar:/opt/local/poi/poi-contrib-2.5.1-final-20040804.jar org.apache.poi.contrib.poibrowser.POIBrowser MyWord.doc MyExcel.xls MyPowerpoint.ppt
-
- -
-

Running POI Browser on Windows

- -

Suppose you have unpacked the POI 2.5.1 release in the - C:\Programs\POI directory of your Windows box. Then the following - command starts the POI Browser and displays the structure of the files - MyWord.doc, MyExcel.xls and - MyPowerpoint.ppt:

- -
java -classpath C:\Programs\POI\poi-2.5.1-final-20040804.jar;C:\Programs\POI\poi-contrib-2.5.1-final-20040804.jar org.apache.poi.contrib.poibrowser.POIBrowser MyWord.doc MyExcel.xls MyPowerpoint.ppt
-
- -
- - - - diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/Codec.java b/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java similarity index 100% rename from src/contrib/src/org/apache/poi/contrib/poibrowser/Codec.java rename to src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/DocumentDescriptor.java b/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java similarity index 100% rename from src/contrib/src/org/apache/poi/contrib/poibrowser/DocumentDescriptor.java rename to src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/DocumentDescriptorRenderer.java b/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java similarity index 100% rename from src/contrib/src/org/apache/poi/contrib/poibrowser/DocumentDescriptorRenderer.java rename to src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/ExtendableTreeCellRenderer.java b/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java similarity index 100% rename from src/contrib/src/org/apache/poi/contrib/poibrowser/ExtendableTreeCellRenderer.java rename to src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/POIBrowser.java b/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java similarity index 100% rename from src/contrib/src/org/apache/poi/contrib/poibrowser/POIBrowser.java rename to src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/PropertySetDescriptor.java b/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java similarity index 100% rename from src/contrib/src/org/apache/poi/contrib/poibrowser/PropertySetDescriptor.java rename to src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/PropertySetDescriptorRenderer.java b/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java similarity index 100% rename from src/contrib/src/org/apache/poi/contrib/poibrowser/PropertySetDescriptorRenderer.java rename to src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/TreeReaderListener.java b/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java similarity index 100% rename from src/contrib/src/org/apache/poi/contrib/poibrowser/TreeReaderListener.java rename to src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/Util.java b/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java similarity index 100% rename from src/contrib/src/org/apache/poi/contrib/poibrowser/Util.java rename to src/examples/src/org/apache/poi/poifs/poibrowser/Util.java diff --git a/src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFCellUtil.java b/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java similarity index 100% rename from src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFCellUtil.java rename to src/java/org/apache/poi/hssf/util/HSSFCellUtil.java diff --git a/src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFRegionUtil.java b/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java similarity index 100% rename from src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFRegionUtil.java rename to src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java diff --git a/src/contrib/src/org/apache/poi/ss/usermodel/contrib/CellUtil.java b/src/java/org/apache/poi/ss/util/CellUtil.java similarity index 99% rename from src/contrib/src/org/apache/poi/ss/usermodel/contrib/CellUtil.java rename to src/java/org/apache/poi/ss/util/CellUtil.java index 2cb2c08970..f84a9d2924 100644 --- a/src/contrib/src/org/apache/poi/ss/usermodel/contrib/CellUtil.java +++ b/src/java/org/apache/poi/ss/util/CellUtil.java @@ -213,7 +213,7 @@ public final class CellUtil { * * @param style cell style * @return map of format properties (String -> Object) - * @see #setFormatProperties(CellStyle, Map) + * @see #setFormatProperties(org.apache.poi.ss.usermodel.CellStyle, org.apache.poi.ss.usermodel.Workbook, java.util.Map) */ private static Map getFormatProperties(CellStyle style) { Map properties = new HashMap(); diff --git a/src/contrib/src/org/apache/poi/ss/usermodel/contrib/RegionUtil.java b/src/java/org/apache/poi/ss/util/RegionUtil.java similarity index 100% rename from src/contrib/src/org/apache/poi/ss/usermodel/contrib/RegionUtil.java rename to src/java/org/apache/poi/ss/util/RegionUtil.java diff --git a/src/contrib/src/org/apache/poi/contrib/metrics/FontMetricsDumper.java b/src/java/org/apache/poi/util/FontMetricsDumper.java similarity index 100% rename from src/contrib/src/org/apache/poi/contrib/metrics/FontMetricsDumper.java rename to src/java/org/apache/poi/util/FontMetricsDumper.java -- 2.39.5