You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2010/10/06 09:58:52 UTC
svn commit: r1004919 - in /poi/trunk: ./ maven/
src/contrib/src/org/apache/poi/contrib/
src/contrib/src/org/apache/poi/hssf/ src/contrib/src/org/apache/poi/ss/
src/examples/src/org/apache/poi/poifs/
src/examples/src/org/apache/poi/poifs/poibrowser/ src...
Author: yegor
Date: Wed Oct 6 07:58:51 2010
New Revision: 1004919
URL: http://svn.apache.org/viewvc?rev=1004919&view=rev
Log:
repackaged poi-contrib to poi-main and poi-examples, excluded contrib from build artifacts
Added:
poi/trunk/src/examples/src/org/apache/poi/poifs/
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/contrib/poibrowser/Codec.java
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/contrib/poibrowser/DocumentDescriptor.java
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/contrib/poibrowser/DocumentDescriptorRenderer.java
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/contrib/poibrowser/ExtendableTreeCellRenderer.java
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/contrib/poibrowser/POIBrowser.java
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/contrib/poibrowser/PropertySetDescriptor.java
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/contrib/poibrowser/PropertySetDescriptorRenderer.java
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/contrib/poibrowser/TreeReaderListener.java
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/contrib/poibrowser/Util.java
poi/trunk/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFCellUtil.java
poi/trunk/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFRegionUtil.java
poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java
- copied, changed from r1004142, poi/trunk/src/contrib/src/org/apache/poi/ss/usermodel/contrib/CellUtil.java
poi/trunk/src/java/org/apache/poi/ss/util/RegionUtil.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/ss/usermodel/contrib/RegionUtil.java
poi/trunk/src/java/org/apache/poi/util/FontMetricsDumper.java
- copied unchanged from r1004142, poi/trunk/src/contrib/src/org/apache/poi/contrib/metrics/FontMetricsDumper.java
Removed:
poi/trunk/maven/poi-contrib.pom
poi/trunk/src/contrib/src/org/apache/poi/contrib/
poi/trunk/src/contrib/src/org/apache/poi/hssf/
poi/trunk/src/contrib/src/org/apache/poi/ss/
Modified:
poi/trunk/build.xml
poi/trunk/maven/mvn-deploy.sh
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1004919&r1=1004918&r2=1004919&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Wed Oct 6 07:58:51 2010
@@ -96,14 +96,6 @@ under the License.
<property name="scratchpad.output.test.dir" location="build/scratchpad-test-classes"/>
<property name="scratchpad.testokfile" location="build/scratchpad-testokfile.txt"/>
- <!-- Contributed software: -->
- <property name="contrib.src" location="src/contrib/src"/>
- <property name="contrib.src.test" location="src/contrib/testcases"/>
- <property name="contrib.reports.test" location="build/contrib-test-results"/>
- <property name="contrib.output.dir" location="build/contrib-classes"/>
- <property name="contrib.output.test.dir" location="build/contrib-test-classes"/>
- <property name="contrib.testokfile" location="build/contrib-testokfile.txt"/>
-
<!-- Examples: -->
<property name="examples.src" location="src/examples/src"/>
<property name="examples.output.dir" location="build/examples-classes"/>
@@ -173,11 +165,6 @@ under the License.
<pathelement location="${main.output.dir}"/>
</path>
- <path id="contrib.classpath">
- <path refid="main.classpath"/>
- <pathelement location="${main.output.dir}"/>
- </path>
-
<path id="ooxml.classpath">
<pathelement location="${ooxml.jsr173.jar}"/>
<pathelement location="${ooxml.dom4j.jar}"/>
@@ -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.
<mkdir dir="${scratchpad.output.dir}"/>
<mkdir dir="${scratchpad.output.test.dir}"/>
<mkdir dir="${scratchpad.reports.test}"/>
- <mkdir dir="${contrib.output.dir}"/>
- <mkdir dir="${contrib.output.test.dir}"/>
- <mkdir dir="${contrib.reports.test}"/>
<mkdir dir="${ooxml.output.dir}"/>
<mkdir dir="${ooxml.output.test.dir}"/>
<mkdir dir="${ooxml.reports.test}"/>
@@ -413,8 +397,8 @@ under the License.
</target>
<target name="compile" depends="init, compile-main,
- compile-scratchpad, compile-contrib, compile-examples"
- description="Compiles the POI main classes, scratchpad, contrib and examples"/>
+ compile-scratchpad, compile-examples"
+ description="Compiles the POI main classes, scratchpad and examples"/>
<target name="compile-all" depends="compile,compile-ooxml-lite"/>
@@ -473,31 +457,6 @@ under the License.
</copy>
</target>
- <target name="compile-contrib" depends="compile-main">
- <javac target="${jdk.version.class}"
- source="${jdk.version.source}"
- destdir="${contrib.output.dir}"
- srcdir="${contrib.src}"
- debug="${compile.debug}"
- encoding="${java.source.encoding}"
- fork="yes">
- <classpath refid="contrib.classpath"/>
- </javac>
- <javac target="${jdk.version.class}"
- source="${jdk.version.source}"
- failonerror="true"
- destdir="${contrib.output.test.dir}"
- srcdir="${contrib.src.test}"
- debug="${compile.debug}"
- encoding="${java.source.encoding}"
- fork="yes">
- <classpath>
- <path refid="contrib.classpath"/>
- <pathelement path="${contrib.output.dir}"/>
- </classpath>
- </javac>
- </target>
-
<target name="compile-examples" depends="compile-main,compile-scratchpad,compile-ooxml">
<javac target="${jdk.version.class}"
source="${jdk.version.source}"
@@ -566,8 +525,8 @@ under the License.
<delete file="${version.java}"/>
</target>
- <target name="test" depends="compile,test-main,test-scratchpad,test-contrib,test-ooxml"
- description="Tests main, contrib, scratchpad and ooxml"/>
+ <target name="test" depends="compile,test-main,test-scratchpad,test-ooxml"
+ description="Tests main, scratchpad and ooxml"/>
<target name="test-all" depends="test,test-ooxml-lite"/>
<target name="-test-main-check">
@@ -637,41 +596,6 @@ under the License.
<echo file="${scratchpad.testokfile}" append="false" message="testok"/>
</target>
- <target name="-test-contrib-check">
- <uptodate property="contrib.test.notRequired" targetfile="${contrib.testokfile}">
- <srcfiles dir="${contrib.src}"/>
- <srcfiles dir="${contrib.src.test}"/>
- </uptodate>
- </target>
-
- <target name="test-contrib" depends="compile-main,compile-contrib,-test-contrib-check"
- unless="contrib.test.notRequired">
- <junit printsummary="yes" fork="yes" haltonfailure="${halt.on.test.failure}"
- failureproperty="contrib.test.failed">
- <classpath>
- <path refid="contrib.classpath"/>
- <pathelement location="${main.output.dir}"/>
- <pathelement location="${contrib.output.dir}"/>
- <pathelement location="${contrib.output.test.dir}"/>
- </classpath>
- <syspropertyset refid="junit.properties"/>
- <jvmarg value="${poi.test.locale}"/>
- <formatter type="plain"/>
- <batchtest todir="${contrib.reports.test}">
- <fileset dir="${contrib.src.test}">
- <include name="**/Test*.java"/>
- <exclude name="**/AllTests.java"/>
- </fileset>
- </batchtest>
- </junit>
- <delete file="${contrib.testokfile}"/>
- <antcall target="-test-contrib-write-testfile"/>
- </target>
-
- <target name="-test-contrib-write-testfile" unless="contrib.test.failed">
- <echo file="${contrib.testokfile}" append="false" message="testok"/>
- </target>
-
<target name="-test-ooxml-check">
<uptodate property="ooxml.test.notRequired" targetfile="${ooxml.testokfile}">
<srcfiles dir="${ooxml.src}"/>
@@ -775,9 +699,6 @@ under the License.
<include name="org/apache/poi/**"/>
<exclude name="org/apache/poi/hdf/**"/>
</packageset>
- <packageset dir="${contrib.src}" defaultexcludes="yes">
- <include name="org/apache/poi/**"/>
- </packageset>
<packageset dir="${ooxml.src}" defaultexcludes="yes">
<include name="org/apache/poi/**"/>
</packageset>
@@ -785,7 +706,6 @@ under the License.
<classpath id="javadoc.classpath">
<path refid="main.classpath"/>
<path refid="scratchpad.classpath"/>
- <path refid="contrib.classpath"/>
<path refid="ooxml.classpath"/>
<path path="${env.CLASSPATH}"/>
</classpath>
@@ -845,13 +765,6 @@ under the License.
</replacetokens>
</filterchain>
</copy>
- <copy file="maven/poi-contrib.pom" tofile="${dist.dir}/poi-contrib-${version.id}.pom">
- <filterchain>
- <replacetokens>
- <token key="VERSION" value="${version.id}"/>
- </replacetokens>
- </filterchain>
- </copy>
<copy file="maven/poi-scratchpad.pom" tofile="${dist.dir}/poi-scratchpad-${version.id}.pom">
<filterchain>
<replacetokens>
@@ -908,11 +821,6 @@ under the License.
<fileset dir="${main.output.dir}"/>
<metainf dir="legal/"/>
</jar>
- <jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar"
- manifest="build/poi-manifest.mf">
- <fileset dir="${contrib.output.dir}"/>
- <metainf dir="legal/"/>
- </jar>
<jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"
manifest="build/poi-manifest.mf">
<fileset dir="${scratchpad.output.dir}"/>
@@ -946,11 +854,6 @@ under the License.
<fileset dir="${scratchpad.src}"/>
<metainf dir="legal/"/>
</jar>
- <jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}-sources-${DSTAMP}.jar"
- manifest="build/poi-manifest.mf">
- <fileset dir="${contrib.src}"/>
- <metainf dir="legal/"/>
- </jar>
<jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-sources-${DSTAMP}.jar"
manifest="build/poi-manifest.mf">
<fileset dir="${ooxml.src}"/>
@@ -967,7 +870,6 @@ under the License.
<!-- jars to include in binary assemblies -->
<patternset id="bin.dist.jars">
<include name="${jar.name}-${version.id}-${DSTAMP}.jar"/>
- <include name="${jar.name}-contrib-${version.id}-${DSTAMP}.jar"/>
<include name="${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"/>
<include name="${jar.name}-ooxml-${version.id}-${DSTAMP}.jar"/>
<include name="${jar.name}-examples-${version.id}-${DSTAMP}.jar"/>
@@ -1087,7 +989,6 @@ under the License.
<target name="mvn-install" depends="maven.ant.tasks-check,jar,maven-poms">
<m2-install artifactId="poi"/>
<m2-install artifactId="poi-scratchpad"/>
- <m2-install artifactId="poi-contrib"/>
<m2-install artifactId="poi-ooxml"/>
<m2-install artifactId="poi-examples"/>
<m2-install artifactId="poi-ooxml-schemas"/>
@@ -1105,7 +1006,6 @@ under the License.
<exclude name="documentation/content/xdocs/dtd/" />
<exclude name="documentation/content/xdocs/entity/" />
<exclude name="scratchpad/testcases/dummy.txt" />
- <exclude name="contrib/testcases/dummy.txt" />
<exclude name="examples/lib/dummy.txt" />
</fileset>
</rat:report>
Modified: poi/trunk/maven/mvn-deploy.sh
URL: http://svn.apache.org/viewvc/poi/trunk/maven/mvn-deploy.sh?rev=1004919&r1=1004918&r2=1004919&view=diff
==============================================================================
--- poi/trunk/maven/mvn-deploy.sh (original)
+++ poi/trunk/maven/mvn-deploy.sh Wed Oct 6 07:58:51 2010
@@ -46,7 +46,7 @@ M2_SCP=people.apache.org:/www/people.apa
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 \
Copied: poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java (from r1004142, poi/trunk/src/contrib/src/org/apache/poi/ss/usermodel/contrib/CellUtil.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java?p2=poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java&p1=poi/trunk/src/contrib/src/org/apache/poi/ss/usermodel/contrib/CellUtil.java&r1=1004142&r2=1004919&rev=1004919&view=diff
==============================================================================
--- poi/trunk/src/contrib/src/org/apache/poi/ss/usermodel/contrib/CellUtil.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java Wed Oct 6 07:58:51 2010
@@ -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<String, Object> getFormatProperties(CellStyle style) {
Map<String, Object> properties = new HashMap<String, Object>();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org