Merge pull request #325 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0

* commit '883b0bf65760b1cbc964dabee1ccf954efe8f621': KERNEL-1328 fine-poi支持JDK11以及其他的编译问题一并修改了
5 years ago · 31651af9e0
7 changed files with 22 additions and 21 deletions
--- a/fine-jedis/src/com/fr/third/org/apache/commons/pool2/impl/package.html
+++ b/fine-jedis/src/com/fr/third/org/apache/commons/pool2/impl/package.html
@ -17,26 +17,26 @@
 <!-- $Id$ -->
 <html>
   <head>
-      <title>Package Documentation for org.apache.commons.pool2.impl</title>
+      <title>Package Documentation for com.fr.third.org.apache.commons.pool2.impl</title>
   </head>
   <body>
      <p>
         Object pooling API implementations.
      </p>
      <p>
-         {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool}
-         ({@link org.apache.commons.pool2.impl.GenericKeyedObjectPool GenericKeyedObjectPool})
+         {@link com.fr.third.org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool}
+         ({@link com.fr.third.org.apache.commons.pool2.impl.GenericKeyedObjectPool GenericKeyedObjectPool})
         provides a more robust (but also more complicated)
-         implementation of {@link org.apache.commons.pool2.ObjectPool ObjectPool}
-         ({@link org.apache.commons.pool2.KeyedObjectPool KeyedObjectPool}).
+         implementation of {@link com.fr.third.org.apache.commons.pool2.ObjectPool ObjectPool}
+         ({@link com.fr.third.org.apache.commons.pool2.KeyedObjectPool KeyedObjectPool}).
      </p>
      <p>
-         {@link org.apache.commons.pool2.impl.SoftReferenceObjectPool SoftReferenceObjectPool}
+         {@link com.fr.third.org.apache.commons.pool2.impl.SoftReferenceObjectPool SoftReferenceObjectPool}
         provides a {@link java.lang.ref.SoftReference SoftReference} based
-         {@link org.apache.commons.pool2.ObjectPool ObjectPool}.
+         {@link com.fr.third.org.apache.commons.pool2.ObjectPool ObjectPool}.
      </p>
      <p>
-         See also the {@link org.apache.commons.pool2} package.
+         See also the {@link com.fr.third.org.apache.commons.pool2} package.
      </p>
   </body>
 </html>
--- a/fine-jedis/src/com/fr/third/org/apache/commons/pool2/overview.html
+++ b/fine-jedis/src/com/fr/third/org/apache/commons/pool2/overview.html
@ -17,14 +17,14 @@
 <!-- $Id$ -->
 <html>
   <head>
-      <title>Overview of the org.apache.commons.pool2 component</title>
+      <title>Overview of the com.fr.third.org.apache.commons.pool2 component</title>
   </head>
   <body>
      <p>
         Generic Object pooling API with several implementations.
      </p>
      <p>
-         The <code>org.apache.commons.pool2</code> package defines a simple
+         The <code>com.fr.third.org.apache.commons.pool2</code> package defines a simple
         interface for a pool of object instances, and a handful of base
         classes that may be useful when creating pool implementations.
         The API supports pooling of unique objects which can be requested
@ -33,17 +33,17 @@
      <p>
         The <code>org.apache.commons.pool2.impl</code> package contains
         several pool implementations.
-         {@link org.apache.commons.pool2.impl.GenericObjectPool
+         {@link com.fr.third.org.apache.commons.pool2.impl.GenericObjectPool
         GenericObjectPool} has many configuration options and can support
         a limited set of objects such as would be useful in a database
         connection pool.
-         {@link org.apache.commons.pool2.impl.SoftReferenceObjectPool
+         {@link com.fr.third.org.apache.commons.pool2.impl.SoftReferenceObjectPool
         SoftReferenceObjectPool} has no limit on the number of objects in the
         pool, but the garbage collector can remove idle objects from the pool
         as needed.  There is also a keyed version of
-         {@link org.apache.commons.pool2.impl.GenericObjectPool
+         {@link com.fr.third.org.apache.commons.pool2.impl.GenericObjectPool
         GenericObjectPool},
-         {@link org.apache.commons.pool2.impl.GenericKeyedObjectPool
+         {@link com.fr.third.org.apache.commons.pool2.impl.GenericKeyedObjectPool
         GenericKeyedObjectPool}
      </p>
   </body>
--- a/fine-poi/src/com/fr/third/v2/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/fine-poi/src/com/fr/third/v2/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
@ -39,7 +39,7 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.regex.Pattern;

-import org.apache.commons.codec.digest.DigestUtils;
+import com.fr.third.org.apache.commons.codec.digest.DigestUtils;
 import com.fr.third.v2.org.apache.poi.EncryptedDocumentException;
 import com.fr.third.v2.org.apache.poi.POIDocument;
 import com.fr.third.v2.org.apache.poi.ddf.EscherBSERecord;
--- a/fine-poi/src/com/fr/third/v2/org/apache/poi/util/HexDump.java
+++ b/fine-poi/src/com/fr/third/v2/org/apache/poi/util/HexDump.java
@ -29,7 +29,7 @@ import java.io.PrintStream;
 import java.nio.charset.Charset;
 import java.util.Locale;

-import org.apache.commons.codec.CharEncoding;
+import com.fr.third.org.apache.commons.codec.CharEncoding;

 /**
 * dump data in hexadecimal format
--- a/fine-poi/src/com/fr/third/v2/org/apache/poi/util/OOXMLLite.java
+++ b/fine-poi/src/com/fr/third/v2/org/apache/poi/util/OOXMLLite.java
@ -43,7 +43,8 @@ import junit.framework.TestCase;

 import org.junit.Test;
 import org.junit.internal.TextListener;
-import org.junit.runner.JUnitCore;import org.junit.runner.Result;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;

 /**
 * Build a 'lite' version of the ooxml-schemas.jar
--- a/fine-poi/src/com/fr/third/v2/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
+++ b/fine-poi/src/com/fr/third/v2/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
@ -293,7 +293,7 @@ public class XSSFImportFromXML {

        // Dummy implementation - not used!
        @Override
-        public Iterator<?> getPrefixes(String val) {
+        public Iterator<String> getPrefixes(String val) {
            return null;
        }

--- a/fine-spring/src/com/fr/third/springframework/aop/target/CommonsPoolTargetSource.java
+++ b/fine-spring/src/com/fr/third/springframework/aop/target/CommonsPoolTargetSource.java
@ -16,9 +16,9 @@

 package com.fr.third.springframework.aop.target;

-import org.apache.commons.pool.ObjectPool;
-import org.apache.commons.pool.PoolableObjectFactory;
-import org.apache.commons.pool.impl.GenericObjectPool;
+import com.fr.third.org.apache.commons.pool.ObjectPool;
+import com.fr.third.org.apache.commons.pool.PoolableObjectFactory;
+import com.fr.third.org.apache.commons.pool.impl.GenericObjectPool;

 import com.fr.third.springframework.beans.BeansException;
 import com.fr.third.springframework.core.Constants;