You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by sg...@apache.org on 2020/08/03 19:53:51 UTC
[freemarker-generator] 02/02: FREEMARKER-153 Move
"freemarker-cli/templates" to "freemarker-cli/src/templates"
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-153
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 142c3f96253ad61f1e22ae14a668f2dfc979c67e
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Mon Aug 3 21:53:27 2020 +0200
FREEMARKER-153 Move "freemarker-cli/templates" to "freemarker-cli/src/templates"
---
freemarker-generator-cli/pom.xml | 2 +-
.../{ => src}/templates/cat.ftl | 0
.../{ => src}/templates/csv/csv/transform.ftl | 2 +-
.../{ => src}/templates/csv/html/transform.ftl | 2 +-
.../{ => src}/templates/csv/md/transform.ftl | 2 +-
.../{ => src}/templates/excel/csv/transform.ftl | 2 +-
.../{ => src}/templates/excel/html/transform.ftl | 0
.../{ => src}/templates/excel/md/transform.ftl | 0
.../{ => src}/templates/info.ftl | 0
.../{ => src}/templates/json/yaml/transform.ftl | 0
.../{ => src}/templates/lib/commons-csv.ftl | 0
.../{ => src}/templates/yaml/json/transform.ftl | 0
.../freemarker/generator/cli/ExamplesTest.java | 28 +++++++++++-----------
.../freemarker/generator/cli/ManualTest.java | 10 ++++----
.../generator/cli/TemplateLoadingTest.java | 2 +-
.../cli/config/TemplateDirectorySupplierTest.java | 4 ++--
16 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/freemarker-generator-cli/pom.xml b/freemarker-generator-cli/pom.xml
index 66310bc..2e8331b 100644
--- a/freemarker-generator-cli/pom.xml
+++ b/freemarker-generator-cli/pom.xml
@@ -78,7 +78,7 @@
<copy file="./src/main/scripts/run-examples.bat" todir="./target/appassembler" />
<copy file="./src/main/scripts/run-examples.sh" todir="./target/appassembler" />
<copy todir="./target/appassembler/templates">
- <fileset dir="templates" />
+ <fileset dir="src/templates" />
</copy>
<copy todir="./target/appassembler/examples">
<fileset dir="src/examples" />
diff --git a/freemarker-generator-cli/templates/cat.ftl b/freemarker-generator-cli/src/templates/cat.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/cat.ftl
rename to freemarker-generator-cli/src/templates/cat.ftl
diff --git a/freemarker-generator-cli/templates/csv/csv/transform.ftl b/freemarker-generator-cli/src/templates/csv/csv/transform.ftl
similarity index 95%
rename from freemarker-generator-cli/templates/csv/csv/transform.ftl
rename to freemarker-generator-cli/src/templates/csv/csv/transform.ftl
index b02082d..0380665 100644
--- a/freemarker-generator-cli/templates/csv/csv/transform.ftl
+++ b/freemarker-generator-cli/src/templates/csv/csv/transform.ftl
@@ -15,7 +15,7 @@
specific language governing permissions and limitations
under the License.
-->
-<#import "/templates/lib/commons-csv.ftl" as csv />
+<#import "/src/templates/lib/commons-csv.ftl" as csv />
<#assign dataSource = dataSources?values[0]>
<#assign csvParser = tools.csv.parse(dataSource, csv.sourceFormat())>
<#assign csvTargetFormat = csv.targetFormat()>
diff --git a/freemarker-generator-cli/templates/csv/html/transform.ftl b/freemarker-generator-cli/src/templates/csv/html/transform.ftl
similarity index 97%
rename from freemarker-generator-cli/templates/csv/html/transform.ftl
rename to freemarker-generator-cli/src/templates/csv/html/transform.ftl
index 7c52f73..fad0c48 100644
--- a/freemarker-generator-cli/templates/csv/html/transform.ftl
+++ b/freemarker-generator-cli/src/templates/csv/html/transform.ftl
@@ -15,7 +15,7 @@
specific language governing permissions and limitations
under the License.
-->
-<#import "/templates/lib/commons-csv.ftl" as csv />
+<#import "/src/templates/lib/commons-csv.ftl" as csv />
<#assign dataSource = dataSources?values[0]>
<#assign csvParser = tools.csv.parse(dataSource, csv.sourceFormat())>
<#assign csvHeaders = csvParser.getHeaderNames()>
diff --git a/freemarker-generator-cli/templates/csv/md/transform.ftl b/freemarker-generator-cli/src/templates/csv/md/transform.ftl
similarity index 96%
rename from freemarker-generator-cli/templates/csv/md/transform.ftl
rename to freemarker-generator-cli/src/templates/csv/md/transform.ftl
index ec50a98..88595b9 100644
--- a/freemarker-generator-cli/templates/csv/md/transform.ftl
+++ b/freemarker-generator-cli/src/templates/csv/md/transform.ftl
@@ -14,7 +14,7 @@
specific language governing permissions and limitations
under the License.
-->
-<#import "/templates/lib/commons-csv.ftl" as csv />
+<#import "/src/templates/lib/commons-csv.ftl" as csv />
<#assign dataSource = dataSources?values[0]>
<#assign csvParser = tools.csv.parse(dataSource, csv.sourceFormat())>
<#assign headers = (csvParser.getHeaderMap()!{})?keys>
diff --git a/freemarker-generator-cli/templates/excel/csv/transform.ftl b/freemarker-generator-cli/src/templates/excel/csv/transform.ftl
similarity index 97%
rename from freemarker-generator-cli/templates/excel/csv/transform.ftl
rename to freemarker-generator-cli/src/templates/excel/csv/transform.ftl
index 0138bf5..16f150e 100644
--- a/freemarker-generator-cli/templates/excel/csv/transform.ftl
+++ b/freemarker-generator-cli/src/templates/excel/csv/transform.ftl
@@ -16,7 +16,7 @@
under the License.
-->
<#-- Parse the first data source & sheet of the Excel document -->
-<#import "/templates/lib/commons-csv.ftl" as csv />
+<#import "/src/templates/lib/commons-csv.ftl" as csv />
<#assign workbook = tools.excel.parse(dataSources?values[0])>
<#assign sheet = tools.excel.getSheets(workbook)[0]>
<#assign records = tools.excel.toTable(sheet)>
diff --git a/freemarker-generator-cli/templates/excel/html/transform.ftl b/freemarker-generator-cli/src/templates/excel/html/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/excel/html/transform.ftl
rename to freemarker-generator-cli/src/templates/excel/html/transform.ftl
diff --git a/freemarker-generator-cli/templates/excel/md/transform.ftl b/freemarker-generator-cli/src/templates/excel/md/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/excel/md/transform.ftl
rename to freemarker-generator-cli/src/templates/excel/md/transform.ftl
diff --git a/freemarker-generator-cli/templates/info.ftl b/freemarker-generator-cli/src/templates/info.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/info.ftl
rename to freemarker-generator-cli/src/templates/info.ftl
diff --git a/freemarker-generator-cli/templates/json/yaml/transform.ftl b/freemarker-generator-cli/src/templates/json/yaml/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/json/yaml/transform.ftl
rename to freemarker-generator-cli/src/templates/json/yaml/transform.ftl
diff --git a/freemarker-generator-cli/templates/lib/commons-csv.ftl b/freemarker-generator-cli/src/templates/lib/commons-csv.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/lib/commons-csv.ftl
rename to freemarker-generator-cli/src/templates/lib/commons-csv.ftl
diff --git a/freemarker-generator-cli/templates/yaml/json/transform.ftl b/freemarker-generator-cli/src/templates/yaml/json/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/yaml/json/transform.ftl
rename to freemarker-generator-cli/src/templates/yaml/json/transform.ftl
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
index 97f7e77..5df3dde 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
@@ -31,12 +31,12 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldRunInfo() throws IOException {
- assertValid(execute("-t templates/info.ftl README.md"));
+ assertValid(execute("-t src/templates/info.ftl README.md"));
}
@Test
public void shouldRunMultipleTimes() throws IOException {
- assertValid(execute("--times=2 -t templates/info.ftl README.md"));
+ assertValid(execute("--times=2 -t src/templates/info.ftl README.md"));
}
@Test
@@ -46,22 +46,22 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldRunCsvExamples() throws IOException {
- assertValid(execute("-t templates/csv/html/transform.ftl src/examples/data/csv/contract.csv"));
- assertValid(execute("-t templates/csv/md/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/templates/csv/html/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/templates/csv/md/transform.ftl src/examples/data/csv/contract.csv"));
assertValid(execute("-t src/examples/templates/csv/shell/curl.ftl src/examples/data/csv/user.csv"));
assertValid(execute("-t src/examples/templates/csv/fo/transform.ftl src/examples/data/csv/locker-test-users.csv"));
assertValid(execute("-t src/examples/templates/csv/fo/transactions.ftl src/examples/data/csv/transactions.csv"));
assertValid(execute("-t src/examples/templates/csv/html/transactions.ftl src/examples/data/csv/transactions.csv"));
- assertValid(execute("-t templates/csv/csv/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/templates/csv/csv/transform.ftl src/examples/data/csv/contract.csv"));
}
@Test
public void shouldRunExcelExamples() throws IOException {
- assertValid(execute("-t templates/excel/html/transform.ftl src/examples/data/excel/test.xls"));
- assertValid(execute("-t templates/excel/html/transform.ftl src/examples/data/excel/test.xlsx"));
- assertValid(execute("-t templates/excel/html/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
- assertValid(execute("-t templates/excel/md/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
- assertValid(execute("-t templates/excel/csv/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
+ assertValid(execute("-t src/templates/excel/html/transform.ftl src/examples/data/excel/test.xls"));
+ assertValid(execute("-t src/templates/excel/html/transform.ftl src/examples/data/excel/test.xlsx"));
+ assertValid(execute("-t src/templates/excel/html/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
+ assertValid(execute("-t src/templates/excel/md/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
+ assertValid(execute("-t src/templates/excel/csv/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
assertValid(execute("-t src/examples/templates/excel/csv/custom.ftl -Pcsv.format=MYSQL src/examples/data/excel/test.xls"));
assertValid(execute("-t src/examples/templates/excel/dataframe/transform.ftl src/examples/data/excel/test.xls"));
}
@@ -75,7 +75,7 @@ public class ExamplesTest extends AbstractMainTest {
public void shouldRunJsonExamples() throws IOException {
assertValid(execute("-t src/examples/templates/json/csv/swagger-endpoints.ftl src/examples/data/json/swagger-spec.json"));
assertValid(execute("-t src/examples/templates/json/md/github-users.ftl src/examples/data/json/github-users.json"));
- assertValid(execute("-t templates/json/yaml/transform.ftl src/examples/data/json/swagger-spec.json"));
+ assertValid(execute("-t src/templates/json/yaml/transform.ftl src/examples/data/json/swagger-spec.json"));
}
@Test
@@ -86,7 +86,7 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldRunYamlExamples() throws IOException {
assertValid(execute("-t src/examples/templates/yaml/txt/transform.ftl src/examples/data/yaml/customer.yaml"));
- assertValid(execute("-t templates/yaml/json/transform.ftl src/examples/data/yaml/swagger-spec.yaml"));
+ assertValid(execute("-t src/templates/yaml/json/transform.ftl src/examples/data/yaml/swagger-spec.yaml"));
}
@Test
@@ -135,8 +135,8 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldTransformMultipleTemplates() throws IOException {
- assertValid(execute("-t templates/csv/md/transform.ftl -t templates/csv/html/transform.ftl src/examples/data/csv/contract.csv"));
- assertValid(execute("-t templates/csv/md/transform.ftl -o target/contract.md -t templates/csv/html/transform.ftl -o target/contract.html src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/templates/csv/md/transform.ftl -t src/templates/csv/html/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/templates/csv/md/transform.ftl -o target/contract.md -t src/templates/csv/html/transform.ftl -o target/contract.html src/examples/data/csv/contract.csv"));
}
@Test
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java
index 06f8714..62a20a3 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java
@@ -25,11 +25,11 @@ public class ManualTest {
private static final String SPACE = " ";
// private static final String CMD = "-V";
- // private static final String CMD = "-PCSV_SOURCE_FORMAT=DATAFRAME -t examples/templates/dataframe/example.ftl https://raw.githubusercontent.com/nRo/DataFrame/master/src/test/resources/users.csv";
- // private static final String CMD = "-PCSV_SOURCE_WITH_HEADER=false -PCSV_SOURCE_FORMAT=DEFAULT -PCSV_TARGET_FORMAT=EXCEL -PCSV_TARGET_WITH_HEADER=true -t templates/csv/csv/transform.ftl examples/data/csv/contract.csv";
- // private static final String CMD = "-t examples/templates/json/dataframe/github-users.ftl examples/data/json/github-users.json";
- // private static final String CMD = "-t templates/csv/md/transform.ftl -o target/contract.md -t templates/csv/html/transform.ftl examples/data/csv/contract.csv";
- private static final String CMD = "-t examples/templates/demo.ftl src/test/data";
+ // private static final String CMD = "-PCSV_SOURCE_FORMAT=DATAFRAME -t src/examples/templates/dataframe/example.ftl https://raw.githubusercontent.com/nRo/DataFrame/master/src/test/resources/users.csv";
+ // private static final String CMD = "-PCSV_SOURCE_WITH_HEADER=false -PCSV_SOURCE_FORMAT=DEFAULT -PCSV_TARGET_FORMAT=EXCEL -PCSV_TARGET_WITH_HEADER=true -t templates/csv/csv/transform.ftl src/examples/data/csv/contract.csv";
+ // private static final String CMD = "-t src/examples/templates/json/dataframe/github-users.ftl src/examples/data/json/github-users.json";
+ // private static final String CMD = "-t src/templates/csv/md/transform.ftl -o target/contract.md -t src/templates/csv/html/transform.ftl src/examples/data/csv/contract.csv";
+ private static final String CMD = "-t src/examples/templates/demo.ftl src/test/data";
public static void main(String[] args) {
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/TemplateLoadingTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/TemplateLoadingTest.java
index 723f4a8..1ec9a0f 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/TemplateLoadingTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/TemplateLoadingTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals;
public class TemplateLoadingTest extends AbstractMainTest {
private static final int SUCCESS = 0;
- private static final String ANY_TEMPLATE_NAME = "templates/info.ftl";
+ private static final String ANY_TEMPLATE_NAME = "src/templates/info.ftl";
private static final String CURR_DIR = System.getProperty("user.dir", ".");
@Test
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateDirectorySupplierTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateDirectorySupplierTest.java
index 79c9ea4..adacf38 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateDirectorySupplierTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateDirectorySupplierTest.java
@@ -38,8 +38,8 @@ public class TemplateDirectorySupplierTest {
@Test
public void shouldAddTemplateDirectory() throws IOException {
- assertEquals(nrOfDefaultTemplateDirectories + 1, templateDirectories("templates").size());
- assertEquals(nrOfDefaultTemplateDirectories + 1, templateDirectories("./templates").size());
+ assertEquals(nrOfDefaultTemplateDirectories + 1, templateDirectories("src/templates").size());
+ assertEquals(nrOfDefaultTemplateDirectories + 1, templateDirectories("./src/templates").size());
}
@Test