jpdfbookmarks-2.5.4

life888888 · Mar 16, 2022 · af8bb2d · af8bb2d
1 parent 61429c1
commit af8bb2d
Show file tree

Hide file tree

Showing 51 changed files with 1,882 additions and 51 deletions.
diff --git a/Bookmark/pom.xml b/Bookmark/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>it.flavianopetrocchi.jpdfbookmarks</groupId>
     <artifactId>jpdfbookmarks</artifactId>
-    <version>2.5.2</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>Bookmark</artifactId>
   <packaging>jar</packaging>

diff --git a/CollapsingPanel/pom.xml b/CollapsingPanel/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>it.flavianopetrocchi.jpdfbookmarks</groupId>
     <artifactId>jpdfbookmarks</artifactId>
-    <version>2.5.2</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>CollapsingPanel</artifactId>
   <packaging>jar</packaging>

diff --git a/Colors/pom.xml b/Colors/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>it.flavianopetrocchi.jpdfbookmarks</groupId>
     <artifactId>jpdfbookmarks</artifactId>
-    <version>2.5.2</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>Colors</artifactId>
   <packaging>jar</packaging>

diff --git a/README.adoc b/README.adoc
@@ -1,4 +1,4 @@
-= JPdfBookmarks v2.5.2 Maven
+= JPdfBookmarks
 life888888
 :doctype: article
 :encoding: utf-8
@@ -7,7 +7,10 @@ life888888
 :numbered:
 :experimental:
 
-JPdfBookmarks v2.5.2-maven is mirgrate from jpdfbookmarks-src-2.5.2.tar.gz (https://sourceforge.net/projects/jpdfbookmarks/files/JPdfBookmarks-2.5.2/jpdfbookmarks-src-2.5.2.tar.gz/download)
+* JPdfBookmarks is mirgrate from jpdfbookmarks-src-2.5.2.tar.gz (https://sourceforge.net/projects/jpdfbookmarks/files/JPdfBookmarks-2.5.2/jpdfbookmarks-src-2.5.2.tar.gz/download)
+* 2.5.4 is based on 2.5.2-maven
+* fix JPdfBookmarks GUI mode open a pdf have bookmarks include CJK (Chinese , Japanese , Korean ) characters will show like tofu char (`□`)
+
 
 
 == Build System requirement
@@ -19,16 +22,16 @@ JPdfBookmarks v2.5.2-maven is mirgrate from jpdfbookmarks-src-2.5.2.tar.gz (http
 
 === Download Source
 
-* Download `Releases/v2.5.2-maven` (jpdfbookmarks-src-2.5.2-maven)
+* Download `Releases/v2.5.4` (jpdfbookmarks-2.5.4)
 
-* Unzip JPdfBookmarks-2.5.2-maven.tar.gz or JPdfBookmarks-2.5.2-maven.zip
+* Unzip JPdfBookmarks-2.5.4.tar.gz or JPdfBookmarks-2.5.4.zip
 
 === Do it once before the first execution 
 
 .Install jpedal_lgpl.jar to the local maven repository
 [source,bash]
 ----
-cd JPdfBookmarks-2.5.2-maven/jpdfbookmarks_lib
+cd JPdfBookmarks-2.5.4/jpdfbookmarks_lib
 ./install_lib.sh
 
 # Windows
@@ -40,7 +43,7 @@ install_lib.bat
 
 [source,bash]
 ----
-cd JPdfBookmarks-2.5.2-maven
+cd JPdfBookmarks-2.5.4
 mvn clean package
 
 cd jpdfbookmarks_core/target
@@ -49,12 +52,12 @@ cd jpdfbookmarks_core/target
 your can find:
 
 * Binary Release
-** jpdfbookmarks-2.5.2.tar.gz
-** jpdfbookmarks-2.5.2.zip
+** jpdfbookmarks-2.5.4.tar.gz
+** jpdfbookmarks-2.5.4.zip
 
 * Source Release
-** jpdfbookmarks-src-2.5.2.tar.gz
-** jpdfbookmarks-src-2.5.2.zip
+** jpdfbookmarks-src-2.5.4.tar.gz
+** jpdfbookmarks-src-2.5.4.zip
 
 == HOW TO INSTALL AND UNINSTALL
 
@@ -87,4 +90,36 @@ The retained code and properties files are guaranteed to be consistent with jpdf
 
 == Changes
 
+=== 2.5.2-maven
 The change content of the entire project converted from 2.5.2 to 2.5.2-maven version can refer to https://github.com/life888888/JPdfBookmarks-Maven-Patch
+
+=== 2.5.4
+
+=== Bug Fix 
+
+* JPdfBookmarks GUI mode open a pdf include jpen 2000 images will throw RuntimeException: JPeg 2000 Images needs the VM parameter ...
+
+* JPdfBookmarks GUI mode open a pdf have bookmarks include CJK (Chinese , Japanese , Korean ) characters will show like tofu char (`□`)
+** You can download this https://github.com/life888888/jpdfbookmarks-test-pdf-examples to rebuild test pdf.
+
+=== Improve
+
+* Add jpdfbookmarks_cli.l4j.ini , jpdfbookmarks.l4j.ini
+** User can change lauch4j JVM options by modify jpdfbookmarks_cli.l4j.ini , jpdfbookmarks.l4j.ini
+
+* Change lanuch4j exe prompt user jre download URL
+
+* Add conf/jpdfbookmarks.logging.properties
+** User can see log (jpdfbookmarks.0.log) under home folder
+** User can change jpdfbookmarks.logging.properties setting  like `it.flavianopetrocchi.jpdfbookmarks.level = SEVERE` or change `.level= ALL`
+
+* Add conf/jpdfbookmarks.cjk.font.properties
+** User can change JPdfBookmarks GUI mode , fonts size (like `cjk.fontSize = 16`)
+
+* Add locales/it/flavianopetrocchi/jpdfbookmarks/locales/localizedText_xx_YY.properties
+** User can copy localizedText.properties.template and rename to his language and country code.
+** User can do his own locales.
+
+* Add User Guide Document in docs
+** User can open JPdfBookmarks/docs/USERGUIDE_zh_TW.html to Read User Guide.
+** Developer can create docs (Asciidoc format) in JPdfBookmarks-2.5.4/jpdfbookmarks_docs/src/docs/asciidoc
diff --git a/ResourceHelper/pom.xml b/ResourceHelper/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>it.flavianopetrocchi.jpdfbookmarks</groupId>
     <artifactId>jpdfbookmarks</artifactId>
-    <version>2.5.2</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>ResourceHelper</artifactId>
   <packaging>jar</packaging>

diff --git a/Utilities/pom.xml b/Utilities/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>it.flavianopetrocchi.jpdfbookmarks</groupId>
     <artifactId>jpdfbookmarks</artifactId>
-    <version>2.5.2</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>Utilities</artifactId>
   <packaging>jar</packaging>

diff --git a/iText-2.1.7-patched/pom.xml b/iText-2.1.7-patched/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>it.flavianopetrocchi.jpdfbookmarks</groupId>
     <artifactId>jpdfbookmarks</artifactId>
-    <version>2.5.2</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>iText-2.1.7-patched</artifactId>
   <packaging>jar</packaging>
@@ -34,6 +34,12 @@
       <groupId>org.jpedal</groupId>
       <artifactId>jpedal</artifactId>
     </dependency>
+    <!-- FIX org.apache.pdfbox.contentstream.PDFStreamEngine operatorException -->
+    <!-- FIX Cannot read JPEG2000 image: Java Advanced Imaging (JAI) Image I/O Tools are not installed -->
+    <dependency>
+      <groupId>com.github.jai-imageio</groupId>
+      <artifactId>jai-imageio-jpeg2000</artifactId>
+    </dependency>    
     <dependency>
       <groupId>org.dom4j</groupId>
       <artifactId>dom4j</artifactId>

diff --git a/iTextBookmarksConverter/pom.xml b/iTextBookmarksConverter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>it.flavianopetrocchi.jpdfbookmarks</groupId>
     <artifactId>jpdfbookmarks</artifactId>
-    <version>2.5.2</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>iTextBookmarksConverter</artifactId>
   <packaging>jar</packaging>

diff --git a/jpdfbookmarks_core/pom.xml b/jpdfbookmarks_core/pom.xml
@@ -4,13 +4,20 @@
   <parent>
     <groupId>it.flavianopetrocchi.jpdfbookmarks</groupId>
     <artifactId>jpdfbookmarks</artifactId>
-    <version>2.5.2</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>jpdfbookmarks_core</artifactId>
   <packaging>jar</packaging>
   <name>jpdfbookmarks_core</name>
   <build>
     <finalName>jpdfbookmarks</finalName>
+    <!-- jpdfbookmarks.properties - Auto change VERSION=${pom.version} -->
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>    
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -24,9 +31,13 @@
             </manifest>
             <manifestEntries>
               <version>${project.version}</version>
+              <Class-Path>. locales/ conf/</Class-Path>     
               <SplashScreen-Image>it/flavianopetrocchi/jpdfbookmarks/splash.png</SplashScreen-Image>
             </manifestEntries>
           </archive>
+          <excludes>
+            <exclude>conf/**</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <!-- launch4j must run before assembly -->
@@ -49,7 +60,7 @@
               <errTitle>JPdfBookmarks</errTitle>
               <chdir/>
               <priority>normal</priority>
-              <downloadUrl>https://www.java.com/download</downloadUrl>
+              <downloadUrl>https://adoptium.net/releases.html</downloadUrl>
               <supportUrl>http://flavianopetrocchi.blogspot.com/</supportUrl>
               <customProcName>false</customProcName>
               <stayAlive>true</stayAlive>
@@ -60,12 +71,7 @@
                 <minVersion>1.8.0</minVersion>
                 <maxVersion/>
                 <jdkPreference>preferJre</jdkPreference>
-                <initialHeapSize>64</initialHeapSize>
-                <maxHeapSize>512</maxHeapSize>
                 <runtimeBits>64/32</runtimeBits>
-                <opts>
-                  <opt>-splash:</opt>
-                </opts>
               </jre>
             </configuration>
           </execution>
@@ -83,7 +89,7 @@
               <errTitle>JPdfBookmarks</errTitle>
               <chdir/>
               <priority>normal</priority>
-              <downloadUrl>https://www.java.com/download</downloadUrl>
+              <downloadUrl>https://adoptium.net/releases.html</downloadUrl>
               <supportUrl>http://flavianopetrocchi.blogspot.com/</supportUrl>
               <customProcName>false</customProcName>
               <stayAlive>false</stayAlive>
@@ -94,8 +100,6 @@
                 <minVersion>1.8.0</minVersion>
                 <maxVersion/>
                 <jdkPreference>preferJre</jdkPreference>
-                <initialHeapSize>64</initialHeapSize>
-                <maxHeapSize>512</maxHeapSize>
                 <runtimeBits>64/32</runtimeBits>
               </jre>
             </configuration>

diff --git a/jpdfbookmarks_core/src/main/assembly/bin-distribution.conf.xml b/jpdfbookmarks_core/src/main/assembly/bin-distribution.conf.xml
@@ -9,39 +9,62 @@
 	</formats>
 
 	<fileSets>
-		<!-- 把專案相關的說明檔案，打包進zip檔案的根目錄 -->
+		<!-- 把專案相關的說明檔案，打包進bin-distribution檔案的根目錄 -->
 		<fileSet>
 			<directory>${project.parent.basedir}</directory>
 			<outputDirectory>/</outputDirectory>
 			<includes>
 				<include>COPYING</include>
-				<include>README</include>		
+				<include>README</include>
+				<include>README.adoc</include>
 			</includes>
 		</fileSet>
 
-		<!-- 把專案的指令碼檔案目錄(src/main/scripts)中的啟動指令碼檔案，打包進zip檔案的跟目錄 -->
+		<!-- 把專案的指令碼檔案目錄(src/main/scripts)中的啟動指令碼檔案，打包進bin-distribution檔案的跟目錄 -->
 		<fileSet>
 			<directory>${project.build.scriptSourceDirectory}</directory>
 			<outputDirectory></outputDirectory>
 			<includes>
 				<include>jpdfbookmarks</include>
 				<include>jpdfbookmarks_cli</include>
-				<include>link_this_in_linux_path.sh</include>		
-				<include>link_this_in_linux_path_cli.sh</include>	
+				<include>link_this_in_linux_path.sh</include>
+				<include>link_this_in_linux_path_cli.sh</include>
 			</includes>
 			<fileMode>0744</fileMode>
 		</fileSet>
-		<!-- 把 launch4j 產出的 exe 檔案，打包進zip檔案的根目錄 -->
+
+		<!-- 把專案的配置檔案，打包進bin-distribution檔案的conf目錄 -->
+		<fileSet>
+			<directory>${project.basedir}/src/main/resources/conf</directory>
+			<outputDirectory>conf</outputDirectory>
+ 			<includes>
+				<include>jpdfbookmarks.cjk.font.properties</include>
+				<include>jpdfbookmarks.logging.properties</include>
+			</includes>
+		</fileSet>
+
+		<!-- 把 launch4j 產出的 exe 檔案，打包進bin-distribution檔案的根目錄 -->
 		<fileSet>
 			<directory>${project.build.directory}</directory>
 			<outputDirectory></outputDirectory>
 			<includes>
 				<include>jpdfbookmarks.exe</include>
 				<include>jpdfbookmarks_cli.exe</include>
 			</includes>
-		</fileSet>		
-
-		<!-- 把專案自己編譯出來的jar檔案，打包進zip檔案的根目錄 -->
+		</fileSet>
+
+		<!-- Launch4j Runtime ini -->
+  		<fileSet>
+			<directory>${project.basedir}/src/main/launch4j</directory>
+			<outputDirectory></outputDirectory>
+			<includes>
+				<include>jpdfbookmarks.l4j.ini</include>
+			        <include>jpdfbookmarks_cli.l4j.ini</include>			
+			</includes>
+			<lineEnding>windows</lineEnding>
+		</fileSet>
+
+		<!-- 把專案自己編譯出來的jar檔案，打包進bin-distribution檔案的根目錄 -->
 		<fileSet>
 			<directory>${project.build.directory}</directory>
 			<outputDirectory></outputDirectory>
@@ -50,22 +73,39 @@
 			</includes>
 		</fileSet>
 
-
-
-		<!-- Splash Screen，打包進zip檔案的根目錄 -->
+		<!-- ICON image，打包進bin-distribution檔案的根目錄 -->
 		<fileSet>
 			<directory>${project.basedir}/src/main/images</directory>
 			<outputDirectory></outputDirectory>
 			<includes>
 				<include>jpdfbookmarks.png</include>
 			</includes>
 		</fileSet>
+
+		<!-- 把專案的多國語言檔案，打包進bin-distribution檔案的locales目錄 -->
+		<fileSet>
+			<directory>${project.basedir}/src/main/locales</directory>
+			<outputDirectory>locales</outputDirectory>
+			<includes>
+				<include>*/**</include>
+			</includes>
+		</fileSet>
+
+		<!-- 把專案相關的使用者指南文件，打包進bin-distribution檔案的根目錄 -->
+		<fileSet>
+			<directory>${project.parent.basedir}/jpdfbookmarks_docs/target/generated-docs</directory>
+			<outputDirectory>docs</outputDirectory>
+			<includes>
+				<include>*/**</include>
+			</includes>
+		</fileSet>		
 
+
 	</fileSets>
 	<!-- Adds dependencies to zip package under lib directory -->
 	<dependencySets>
-		<!-- 第三方jar不要解壓，打包進zip檔案的lib目錄 -->
-		<!-- 不使用專案的artifact(jpdfbookmarks.jar)-->
+		<!-- 第三方jar不要解壓，打包進bin-distribution檔案的lib目錄 -->
+		<!-- 不包含專案的artifact(jpdfbookmarks.jar)-->
 		<dependencySet>            
 			<outputDirectory>lib</outputDirectory>
 			<unpack>false</unpack>