diff --git a/docgen/parameters.json b/docgen/parameters.json index 11b4ffa15..751ad93dc 100644 --- a/docgen/parameters.json +++ b/docgen/parameters.json @@ -1,8 +1,8 @@ { "title" : "Venus (Fugerit Document Generation Framework)", "name": "Venus", - "version" : "1.1.2-rc.001", - "date" : "03/07/2023", + "version" : "1.3.0-rc.001", + "date" : "09/07/2023", "organization" : { "name" : "Fugerit Org", "url" : "https://www.fugerit.org" diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt index a2c9c0cd0..0b3689359 100644 --- a/docgen/release-notes.txt +++ b/docgen/release-notes.txt @@ -1,4 +1,8 @@ -1.2.0-rc.001 (2023-07-07) +1.3.0-rc.001 (2023-07-09) +------------------ ++ [New freemarker configuration model](https://github.com/fugerit-org/fj-bom/issues/38) + +1.2.0-rc.001 (2023-07-07) ------------------ + Added module fj-doc-lib-simpletable-import to convert xlsx or csv to simple table diff --git a/fj-doc-base-json/pom.xml b/fj-doc-base-json/pom.xml index 8bd9b7efa..f26ba79a1 100644 --- a/fj-doc-base-json/pom.xml +++ b/fj-doc-base-json/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-base-json diff --git a/fj-doc-base-yaml/pom.xml b/fj-doc-base-yaml/pom.xml index ba9e2ee95..144f50e88 100644 --- a/fj-doc-base-yaml/pom.xml +++ b/fj-doc-base-yaml/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-base-yaml diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml index 6b42b9d3e..a84f7b9e5 100644 --- a/fj-doc-base/pom.xml +++ b/fj-doc-base/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-base diff --git a/fj-doc-bom-core/pom.xml b/fj-doc-bom-core/pom.xml index 3f6122c9d..c460122a3 100644 --- a/fj-doc-bom-core/pom.xml +++ b/fj-doc-bom-core/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-bom-core diff --git a/fj-doc-bom-fop/pom.xml b/fj-doc-bom-fop/pom.xml index 7bd4536c6..c65473b5f 100644 --- a/fj-doc-bom-fop/pom.xml +++ b/fj-doc-bom-fop/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-bom-fop diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml index 7d2c826b6..cfa63c2f8 100644 --- a/fj-doc-freemarker/pom.xml +++ b/fj-doc-freemarker/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-freemarker @@ -47,7 +47,7 @@ org.fugerit.java fj-doc-base - + diff --git a/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/config/FreeMarkerConfigStep.java b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/config/FreeMarkerConfigStep.java index 94fd88f49..1b9f1e52f 100644 --- a/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/config/FreeMarkerConfigStep.java +++ b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/config/FreeMarkerConfigStep.java @@ -11,6 +11,7 @@ import org.fugerit.java.doc.base.process.DocProcessContext; import org.fugerit.java.doc.base.process.DocProcessData; import org.fugerit.java.doc.base.process.DocProcessorBasic; +import org.fugerit.java.doc.freemarker.process.ConfigInitModel; import freemarker.template.Configuration; import freemarker.template.TemplateExceptionHandler; @@ -21,9 +22,10 @@ public class FreeMarkerConfigStep extends DocProcessorBasic { public static final String ATT_DEFAULT = "FreeMarkerConfigStep.DEFAULT"; public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION = "version"; + public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_2_3_31 = ConfigInitModel.VERSION_2_3_31; public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_2_3_30 = "2.3.30"; public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_2_3_29 = "2.3.29"; - public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_DEFAULT = ATT_FREEMARKER_CONFIG_KEY_VERSION_2_3_30; + public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_DEFAULT = ConfigInitModel.DEFAULT_VERSION; public static final String ATT_FREEMARKER_CONFIG_KEY_MODE = "mode"; public static final String ATT_FREEMARKER_CONFIG_KEY_MODE_CLASS = "class"; diff --git a/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/ConfigInitModel.java b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/ConfigInitModel.java new file mode 100644 index 000000000..bff4b0a2b --- /dev/null +++ b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/ConfigInitModel.java @@ -0,0 +1,99 @@ +package org.fugerit.java.doc.freemarker.process; + +import java.io.Serializable; +import java.io.StringWriter; +import java.io.Writer; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import org.fugerit.java.core.cfg.xml.IdConfigType; +import org.fugerit.java.core.lang.helpers.BooleanUtils; +import org.fugerit.java.core.util.collection.KeyString; +import org.fugerit.java.core.util.regex.ParamFinder; +import org.fugerit.java.doc.base.process.DocProcessContext; +import org.fugerit.java.doc.base.process.DocProcessData; +import org.fugerit.java.doc.freemarker.config.FreeMarkerConstants; +import org.fugerit.java.doc.freemarker.config.FreemarkerApplyHelper; + +import freemarker.template.Configuration; +import freemarker.template.Template; +import lombok.Data; + +@Data +public class ConfigInitModel implements IdConfigType, KeyString, Serializable { + + public static final String VERSION_2_3_31 = "2.3.31"; + public static final String DEFAULT_VERSION = VERSION_2_3_31; + + public static final String DEFAULT_CLASS_NAME = FreemarkerDocProcessConfigFacade.class.getName(); + + public static final String DEFAULT_MODE = "class"; + + public static final String DEFAULT_EXCEPTION_HANDLER = "RETHROW_HANDLER"; + + public static final String DEFAULT_LOG_EXCEPTION = BooleanUtils.BOOLEAN_FALSE; + + public static final String DEFAULT_WRAP_UNCHECKED_EXCEPTION = BooleanUtils.BOOLEAN_TRUE; + + public static final String DEFAULT_FALL_BACK_ON_NULL_LOOP_VARIABLE = BooleanUtils.BOOLEAN_FALSE; + + private static final long serialVersionUID = -59587465058736934L; + + private String id; + + private String version = DEFAULT_VERSION; + + private String path; + + private String mode = DEFAULT_MODE; + + private String className = DEFAULT_CLASS_NAME; + + private String exceptionHandler = DEFAULT_EXCEPTION_HANDLER; + + private String logException = DEFAULT_LOG_EXCEPTION; + + private String wrapUncheckedExceptions = DEFAULT_WRAP_UNCHECKED_EXCEPTION; + + private String fallbackOnNullLoopVariable = DEFAULT_FALL_BACK_ON_NULL_LOOP_VARIABLE; + + private Configuration freemarkerConfiguration; + + public static final String CHAIN_ID_PARAM = "chainId"; + + protected void process( DocChainModel model, DocProcessContext context, DocProcessData data ) throws Exception { + // override template path + String templatePath = model.getTemplatePath(); + ParamFinder finder = ParamFinder.newFinder(); + Properties params = new Properties(); + params.setProperty( CHAIN_ID_PARAM , model.getId() ); + templatePath = finder.substitute( templatePath , params ); + // map attributes + Map map = FreeMarkerConstants.getFreeMarkerMap( context ); + if ( map == null ) { + map = new HashMap<>(); + } + map.putAll( context.toMap() ); + Template template = this.getFreemarkerConfiguration().getTemplate( templatePath ); + FreemarkerApplyHelper.setupFreemarkerMap( this.freemarkerConfiguration, map); + Writer out = new StringWriter(); + template.process( map, out); + data.setCurrentXmlData( out.toString() ); + } + + @Override + public String getKey() { + return this.getId(); + } + + @Override + public String toString() { + return "ConfigInitModel [id=" + id + ", version=" + version + ", path=" + path + ", mode=" + mode + + ", className=" + className + ", exceptionHandler=" + exceptionHandler + ", logException=" + + logException + ", wrapUncheckedExceptions=" + wrapUncheckedExceptions + + ", fallbackOnNullLoopVariable=" + fallbackOnNullLoopVariable + ", freemarkerConfiguration=" + + freemarkerConfiguration + "]"; + } + +} diff --git a/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/DocChainModel.java b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/DocChainModel.java new file mode 100644 index 000000000..d3bfc7123 --- /dev/null +++ b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/DocChainModel.java @@ -0,0 +1,26 @@ +package org.fugerit.java.doc.freemarker.process; + +import java.io.Serializable; + +import org.fugerit.java.core.cfg.xml.IdConfigType; +import org.fugerit.java.core.util.collection.KeyString; + +import lombok.Data; + +@Data +public class DocChainModel implements IdConfigType, KeyString, Serializable { + + public static final String DEFAULT_TEMPLATE_PATH = "${chainId}.ftl"; + + private static final long serialVersionUID = 9076457107043072322L; + + private String id; + + private String templatePath = DEFAULT_TEMPLATE_PATH; + + @Override + public String getKey() { + return this.getId(); + } + +} diff --git a/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfig.java b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfig.java new file mode 100644 index 000000000..a61be006c --- /dev/null +++ b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfig.java @@ -0,0 +1,42 @@ +package org.fugerit.java.doc.freemarker.process; + +import java.io.Serializable; + +import org.fugerit.java.core.cfg.xml.ListMapConfig; +import org.fugerit.java.doc.base.process.DocProcessConfig; +import org.fugerit.java.doc.base.process.DocProcessContext; +import org.fugerit.java.doc.base.process.DocProcessData; + +import lombok.Getter; + +public class FreemarkerDocProcessConfig extends DocProcessConfig implements Serializable { + + private static final long serialVersionUID = -6761081877582850120L; + + @Getter + private ListMapConfig configInitList; + + @Getter + private ListMapConfig docChainList; + + protected FreemarkerDocProcessConfig() { + this.configInitList = new ListMapConfig<>(); + this.docChainList = new ListMapConfig<>(); + } + + public void process( String configId, String chainId, DocProcessContext context, DocProcessData data ) throws Exception { + ConfigInitModel configInitModel = this.getConfigInitList().get( configId ); + DocChainModel docChainModel = this.getChainOrDefault(chainId); + configInitModel.process(docChainModel, context, data); + } + + private DocChainModel getChainOrDefault( String id ) { + DocChainModel model = this.getDocChainList().get( id ); + if ( model == null ) { + model = new DocChainModel(); + model.setId( id ); + } + return model; + } + +} diff --git a/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfigFacade.java b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfigFacade.java new file mode 100644 index 000000000..cacc69520 --- /dev/null +++ b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfigFacade.java @@ -0,0 +1,92 @@ +package org.fugerit.java.doc.freemarker.process; + +import java.io.Reader; +import java.util.Properties; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import org.fugerit.java.core.cfg.ConfigException; +import org.fugerit.java.core.cfg.xml.XmlBeanHelper; +import org.fugerit.java.doc.freemarker.config.FreeMarkerConfigStep; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; + +import freemarker.template.Configuration; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class FreemarkerDocProcessConfigFacade { + + public static FreemarkerDocProcessConfig newSimpleConfig( String id, String templatePath ) throws ConfigException { + FreemarkerDocProcessConfig config = new FreemarkerDocProcessConfig(); + ConfigInitModel model = new ConfigInitModel(); + model.setId(id); + model.setPath( templatePath ); + try { + addConfiguration(model); + } catch (Exception e) { + throw new ConfigException( "Error configuring FreemarkerDocProcessConfig : "+e , e ); + } + config.getConfigInitList().add(model); + return config; + } + + public static FreemarkerDocProcessConfig loadConfig( Reader xmlReader ) throws ConfigException { + FreemarkerDocProcessConfig result = null; + try { + FreemarkerDocProcessConfig config = new FreemarkerDocProcessConfig(); + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + dbf.setNamespaceAware( true ); + DocumentBuilder db = dbf.newDocumentBuilder(); + Document doc = db.parse( new InputSource( xmlReader ) ); + NodeList configInitList = doc.getElementsByTagName( "configInit" ); + for ( int k=0; k + + + + + + This is the root element of freemarker-doc-process configuration file + + + + + + + + + + + + Contains the meta informations of the document + ('meta' is kept for compatibility, better use 'metadata') + + + + + + + Contains the meta informations of the document + ('meta' is kept for compatibility, better use 'metadata') + + + + + + Contains the meta informations of the document + (roughly comparable to a HTML 'head' element) + + + + + + + + + + + + + + + + Contains the meta informations of the document + (roughly comparable to a HTML 'head' element) + + + + + + diff --git a/fj-doc-freemarker/src/test/java/test/org/fugerit/java/doc/freemarker/process/TestFreemarkerDocProcessConfig.java b/fj-doc-freemarker/src/test/java/test/org/fugerit/java/doc/freemarker/process/TestFreemarkerDocProcessConfig.java new file mode 100644 index 000000000..4dd6f952c --- /dev/null +++ b/fj-doc-freemarker/src/test/java/test/org/fugerit/java/doc/freemarker/process/TestFreemarkerDocProcessConfig.java @@ -0,0 +1,30 @@ +package test.org.fugerit.java.doc.freemarker.process; + +import static org.junit.Assert.fail; + +import java.io.InputStreamReader; +import java.io.Reader; + +import org.fugerit.java.core.lang.helpers.ClassHelper; +import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig; +import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade; +import org.junit.Test; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class TestFreemarkerDocProcessConfig { + + @Test + public void testConfigRead001() { + try ( Reader xmlReader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( "fj_doc_test/freemarker-doc-process.xml" ) ) ) { + FreemarkerDocProcessConfig config = FreemarkerDocProcessConfigFacade.loadConfig(xmlReader); + log.info( "config -> {}", config.getConfigInitList().get( 0 ).getClassName() ); + } catch (Exception e) { + String message = "Error : "+e; + log.error( message, e ); + fail(message); + } + } + +} diff --git a/fj-doc-freemarker/src/test/resources/fj_doc_test/freemarker-doc-process.xml b/fj-doc-freemarker/src/test/resources/fj_doc_test/freemarker-doc-process.xml new file mode 100644 index 000000000..7d8802154 --- /dev/null +++ b/fj-doc-freemarker/src/test/resources/fj_doc_test/freemarker-doc-process.xml @@ -0,0 +1,24 @@ + + +> + + + + + + diff --git a/fj-doc-freemarker/src/test/resources/log4j2.xml b/fj-doc-freemarker/src/test/resources/log4j2.xml new file mode 100644 index 000000000..51b9129fc --- /dev/null +++ b/fj-doc-freemarker/src/test/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/fj-doc-lib-autodoc/pom.xml b/fj-doc-lib-autodoc/pom.xml index db535d923..bf3ebb22d 100644 --- a/fj-doc-lib-autodoc/pom.xml +++ b/fj-doc-lib-autodoc/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-lib-autodoc @@ -23,7 +23,6 @@ 1.2.4 - 4.0.0 @@ -33,7 +32,6 @@ org.codehaus.mojo jaxb2-maven-plugin - 3.1.0 xjc @@ -85,12 +83,10 @@ jakarta.xml.bind jakarta.xml.bind-api - ${jajarta-jaxb-version} com.sun.xml.bind jaxb-impl - ${jajarta-jaxb-version} runtime diff --git a/fj-doc-lib-simpletable-import/pom.xml b/fj-doc-lib-simpletable-import/pom.xml index 62da00b37..540f77aab 100644 --- a/fj-doc-lib-simpletable-import/pom.xml +++ b/fj-doc-lib-simpletable-import/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-lib-simpletable-import diff --git a/fj-doc-lib-simpletable/pom.xml b/fj-doc-lib-simpletable/pom.xml index 8a1564ba4..b689867a4 100644 --- a/fj-doc-lib-simpletable/pom.xml +++ b/fj-doc-lib-simpletable/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-lib-simpletable diff --git a/fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java b/fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java index b88fa8200..b46e577d1 100644 --- a/fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java +++ b/fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java @@ -1,11 +1,8 @@ package org.fugerit.java.doc.lib.simpletable; -import java.io.InputStream; import java.io.OutputStream; import org.fugerit.java.core.cfg.ConfigException; -import org.fugerit.java.core.lang.helpers.ClassHelper; -import org.fugerit.java.core.util.filterchain.MiniFilterChain; import org.fugerit.java.doc.base.config.DocException; import org.fugerit.java.doc.base.config.DocInput; import org.fugerit.java.doc.base.config.DocOutput; @@ -15,40 +12,35 @@ import org.fugerit.java.doc.base.process.DocProcessConfig; import org.fugerit.java.doc.base.process.DocProcessContext; import org.fugerit.java.doc.base.process.DocProcessData; +import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig; +import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade; import org.fugerit.java.doc.lib.simpletable.model.SimpleTable; public class SimpleTableDocConfig { - private final static String CONFIG_PATH = "fj_doc_lib_simpletable/doc-process-config.xml"; + private static final String CONFIG_ID = "FJ_DOC_LIB_SIMPLETABLE"; - private DocProcessConfig config; + private FreemarkerDocProcessConfig config; - private SimpleTableDocConfig( DocProcessConfig config ) { + private SimpleTableDocConfig( FreemarkerDocProcessConfig config ) { this.config = config; } public static SimpleTableDocConfig newConfig() throws ConfigException { - SimpleTableDocConfig simpleTableDocConfig = null; - try ( InputStream is = ClassHelper.loadFromDefaultClassLoader(CONFIG_PATH) ) { - DocProcessConfig config = DocProcessConfig.loadConfig( is ); - simpleTableDocConfig = new SimpleTableDocConfig( config ); - } catch (Exception e) { - throw new ConfigException( "Error creating configuration : "+e, e ); - } - return simpleTableDocConfig; + FreemarkerDocProcessConfig config = FreemarkerDocProcessConfigFacade.newSimpleConfig( CONFIG_ID, "/fj_doc_lib_simpletable/template/" ); + return new SimpleTableDocConfig(config); } public static final String CHAIN_ID_SIMPLE_TABLE = "simple_table"; public DocProcessConfig getConfig() { - return config; + return this.config; } private void process( String chainId, DocProcessContext context, DocProcessData data ) throws Exception { - MiniFilterChain chain = this.config.getChainCache( chainId ); - chain.apply( context , data ); + this.config.process(CONFIG_ID, CHAIN_ID_SIMPLE_TABLE, context, data); } - + public void processSimpleTable( SimpleTable simpleTableModel, DocTypeHandler handler, OutputStream os ) throws DocException { try { DocProcessData data = new DocProcessData(); @@ -62,5 +54,5 @@ public void processSimpleTable( SimpleTable simpleTableModel, DocTypeHandler ha throw new DocException( "Simple table generation error : "+e, e ); } } - + } diff --git a/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/doc-process-config.xml b/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/doc-process-config.xml deleted file mode 100644 index 9dfd9faad..000000000 --- a/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/doc-process-config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml index d86e55876..8e436334d 100644 --- a/fj-doc-mod-fop/pom.xml +++ b/fj-doc-mod-fop/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-mod-fop diff --git a/fj-doc-mod-opencsv/pom.xml b/fj-doc-mod-opencsv/pom.xml index 5cccedd4e..9e0893302 100644 --- a/fj-doc-mod-opencsv/pom.xml +++ b/fj-doc-mod-opencsv/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-mod-opencsv diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml index b135d5694..956441bf4 100644 --- a/fj-doc-mod-poi/pom.xml +++ b/fj-doc-mod-poi/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-mod-poi diff --git a/fj-doc-playground-quarkus/pom.xml b/fj-doc-playground-quarkus/pom.xml index 24f95d88d..ab38e10d3 100644 --- a/fj-doc-playground-quarkus/pom.xml +++ b/fj-doc-playground-quarkus/pom.xml @@ -4,7 +4,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-playground-quarkus diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml index f49e12bf2..f0a7f5953 100644 --- a/fj-doc-sample/pom.xml +++ b/fj-doc-sample/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-sample diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java index bfc1e0338..4c9be82c3 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java @@ -19,8 +19,10 @@ import org.junit.Before; import org.junit.Test; +import lombok.extern.slf4j.Slf4j; import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest; +@Slf4j public class TestSimpleTable { private static final DocTypeHandler[] HANDLERS = { XlsxPoiTypeHandler.HANDLER, OpenCSVTypeHandler.HANDLER, new PdfFopTypeHandler() }; @@ -32,6 +34,7 @@ public class TestSimpleTable { @Before public void init() throws ConfigException { this.docConfig = SimpleTableDocConfig.newConfig(); + log.info( "config init ok {}", this.docConfig ); if ( !baseDir.exists() ) { this.baseDir.mkdirs(); } @@ -62,7 +65,9 @@ public void testSimpleTable01() { try ( FileOutputStream fos = new FileOutputStream( file ) ) { this.docConfig.processSimpleTable(simpleTableModel, handler, fos); } catch (Exception e) { - fail( "Error : "+e ); + String message = "Error : "+e; + log.error( message, e ); + fail( message ); } } } diff --git a/fj-doc-val-core/pom.xml b/fj-doc-val-core/pom.xml index 8d005a9ef..590871e74 100644 --- a/fj-doc-val-core/pom.xml +++ b/fj-doc-val-core/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-val-core diff --git a/fj-doc-val-pdfbox/pom.xml b/fj-doc-val-pdfbox/pom.xml index 42e8f7f00..19eacf4a2 100644 --- a/fj-doc-val-pdfbox/pom.xml +++ b/fj-doc-val-pdfbox/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-val-pdfbox diff --git a/fj-doc-val-poi/pom.xml b/fj-doc-val-poi/pom.xml index 45d7b529c..61dfb2248 100644 --- a/fj-doc-val-poi/pom.xml +++ b/fj-doc-val-poi/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-val-poi diff --git a/fj-doc-val/pom.xml b/fj-doc-val/pom.xml index b491e2d71..4e018fdaa 100644 --- a/fj-doc-val/pom.xml +++ b/fj-doc-val/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 fj-doc-val diff --git a/pom.xml b/pom.xml index 565c5b1fa..d764b5cb6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ fj-doc - 1.2.0-rc.001 + 1.3.0-rc.001 pom fj-doc @@ -33,6 +33,8 @@ 0.5.0-rc.001 0.5.0-rc.001 0.5.0-rc.001 + + 4.0.0 @@ -93,7 +95,7 @@ - + @@ -228,6 +230,18 @@ ${fj-doc-mod-jxl-version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${jajarta-jaxb-version} + + + com.sun.xml.bind + jaxb-impl + ${jajarta-jaxb-version} + runtime + + @@ -244,6 +258,12 @@ 3.0.0-M5 + + org.codehaus.mojo + jaxb2-maven-plugin + 3.1.0 + +