Merge pull request #16 from fugerit-org/feature/issue_15

fugerit79 · web-flow · commit 69251f2cdda9 · 2023-01-24T10:06:30.000+01:00
0.8.3 (2023-01-24)
diff --git a/docgen/parameters.json b/docgen/parameters.json
@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "0.8.2",
-	"date" : "22/01/2023",
+	"version" : "0.8.3",
+	"date" : "24/01/2023",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"
diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,4 +1,8 @@
-﻿0.8.2 (2023-01-22)
+﻿0.8.3 (2023-01-24)
+------------------
++ [fj-doc-mod-fop - need to create FopConfigClassLoaderWrapper with default ResourceResolver]([0.5.2](https://github.com/fugerit-org/fj-doc/issues/15))
+
+0.8.2 (2023-01-22)
 ------------------
 + Updated fj-core version to 0.8.8
 + Improved playground
diff --git a/fj-doc-base-json/pom.xml b/fj-doc-base-json/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-base-json</name>
diff --git a/fj-doc-base-yaml/pom.xml b/fj-doc-base-yaml/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-base-yaml</name>
diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-base</name>
diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-freemarker</name>
diff --git a/fj-doc-lib-autodoc/pom.xml b/fj-doc-lib-autodoc/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-lib-autodoc</name>
diff --git a/fj-doc-lib-simpletable/pom.xml b/fj-doc-lib-simpletable/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-lib-simpletable</name>
diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-mod-fop</name>
diff --git a/fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/PdfFopTypeHandler.java b/fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/PdfFopTypeHandler.java
@@ -43,7 +43,8 @@ public class PdfFopTypeHandler extends FreeMarkerFopTypeHandler {
 	public static final String ATT_FOP_CONFIG_CLASSLOADER_PATH = "fop-config-classloader-path";
 	
 	public static final String ATT_FOP_CONFIG_RESOLVER_TYPE 		= "fop-config-resover-type";
-	public static final String ATT_FOP_CONFIG_RESOLVER_TYPE_DEFAULT = ClassLoaderResourceResolverWrapper.class.getName();
+
+	public static final String ATT_FOP_CONFIG_RESOLVER_TYPE_DEFAULT = FopConfigClassLoaderWrapper.DEFAULT_RESOURCE_RESOLVER.getClass().getName();
 	
 	@Deprecated
 	public static final String ATT_FONT_BASE_CLASSLOADER_PATH = "font-base-classloader-path";
diff --git a/fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/config/FopConfigClassLoaderWrapper.java b/fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/config/FopConfigClassLoaderWrapper.java
@@ -14,6 +14,8 @@
 
 public class FopConfigClassLoaderWrapper implements FopConfig, Serializable {
 
+	public static final ResourceResolver DEFAULT_RESOURCE_RESOLVER = new ClassLoaderResourceResolverWrapper();
+	
 	/**
 	 * 
 	 */
@@ -31,6 +33,10 @@ public ResourceResolver getCustomResourceResolver() {
 		return customResourceResolver;
 	}
 
+	public FopConfigClassLoaderWrapper(String fopConfigPath ) {
+		this( fopConfigPath, DEFAULT_RESOURCE_RESOLVER );
+	}
+	
 	public FopConfigClassLoaderWrapper(String fopConfigPath, ResourceResolver customResourceResolver) {
 		super();
 		this.fopConfigPath = fopConfigPath;
diff --git a/fj-doc-mod-opencsv/pom.xml b/fj-doc-mod-opencsv/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-mod-opencsv</name>
diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-mod-poi</name>
diff --git a/fj-doc-playground-quarkus/pom.xml b/fj-doc-playground-quarkus/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 	<artifactId>fj-doc-playground-quarkus</artifactId>
 	<properties>
diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-sample</name>
diff --git a/fj-doc-val-core/pom.xml b/fj-doc-val-core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-val-core</name>
diff --git a/fj-doc-val-pdfbox/pom.xml b/fj-doc-val-pdfbox/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-val-pdfbox</name>
diff --git a/fj-doc-val-poi/pom.xml b/fj-doc-val-poi/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-val-poi</name>
diff --git a/fj-doc-val/pom.xml b/fj-doc-val/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.2</version>
+		<version>0.8.3</version>
 	</parent>
 
 	<name>fj-doc-val</name>
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>fj-doc</artifactId>
 
-	<version>0.8.2</version>
+	<version>0.8.3</version>
 	<packaging>pom</packaging>
 
 	<name>fj-doc</name>
