Skip to content

Commit 030d375

Browse files
committed
fj-doc-mod-fop configuration review
1 parent ee410d7 commit 030d375

File tree

3 files changed

+41
-33
lines changed

3 files changed

+41
-33
lines changed

fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/FreeMarkerFopProcess.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import java.io.Serializable;
44

5-
import org.fugerit.java.doc.base.process.DocProcessConfig;
5+
import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig;
6+
import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade;
67

78
public class FreeMarkerFopProcess implements Serializable {
89

@@ -11,11 +12,11 @@ public class FreeMarkerFopProcess implements Serializable {
1112
*/
1213
private static final long serialVersionUID = 1277168639030295400L;
1314

14-
public static final String CONFIG_PATH = "cl://fj_doc_mod_fop_config/fop-process-config.xml";
15+
public static final String CONFIG_PATH = "cl://fj_doc_mod_fop_config/fm-fop-process-config.xml";
1516

16-
private static DocProcessConfig INSTANCE = DocProcessConfig.loadConfigSafe( CONFIG_PATH );
17+
private static FreemarkerDocProcessConfig INSTANCE = FreemarkerDocProcessConfigFacade.loadConfigSafe( CONFIG_PATH );
1718

18-
public static DocProcessConfig getInstance() {
19+
public static FreemarkerDocProcessConfig getInstance() {
1920
return INSTANCE;
2021
}
2122

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<freemarker-doc-process-config
3+
xmlns="https://freemarkerdocprocess.fugerit.org"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="https://freemarkerdocprocess.fugerit.org https://www.fugerit.org/data/java/doc/xsd/freemarker-doc-process-1-0.xsd" >
6+
7+
<!--
8+
Configuration stub version : 003 (2023-07-19)
9+
-->
10+
11+
12+
13+
<docChain id="fop-freemarker">
14+
<chainStep stepType="config">
15+
<config
16+
id="FJDOC_MOD_FOP_FREEMARKER_CONFIG"
17+
class="org.fugerit.java.doc.mod.fop.FreeMarkerFopProcess"
18+
exception-handler="RETHROW_HANDLER"
19+
fallback-on-null-loop-variable="false"
20+
log-exception="false"
21+
mode="class"
22+
path="/fj_doc_mod_fop_config/template/"
23+
version="2.3.29"
24+
wrap-unchecked-exceptions="true"
25+
/>
26+
</chainStep>
27+
<chainStep stepType="map">
28+
<map name="docBase" value="docBase"/>
29+
<map name="docType" value="docType"/>
30+
</chainStep>
31+
<chainStep stepType="complex" template-path="fop_doc.ftl">
32+
</chainStep>
33+
</docChain>
34+
35+
36+
</freemarker-doc-process-config>

fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/fop-process-config.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)