You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/04/11 13:23:35 UTC
[tomee-site-generator] branch master updated: TOMEE-3894 fixed website generation under windows
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-site-generator.git
The following commit(s) were added to refs/heads/master by this push:
new 801b097 TOMEE-3894 fixed website generation under windows
801b097 is described below
commit 801b09755ae651925ea8cf501d3655556b7db194
Author: Swell <57...@users.noreply.github.com>
AuthorDate: Mon Apr 11 14:21:05 2022 +0200
TOMEE-3894 fixed website generation under windows
---
src/main/java/org/apache/tomee/website/Jakartize.java | 2 +-
src/main/java/org/apache/tomee/website/Javadocs.java | 18 +++++++-----------
src/main/java/org/apache/tomee/website/Source.java | 4 ++--
.../apache/tomee/website/TomEEVersionReplacement.java | 2 +-
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/tomee/website/Jakartize.java b/src/main/java/org/apache/tomee/website/Jakartize.java
index cd7264c..9e82b59 100644
--- a/src/main/java/org/apache/tomee/website/Jakartize.java
+++ b/src/main/java/org/apache/tomee/website/Jakartize.java
@@ -52,7 +52,7 @@ public class Jakartize {
}
private boolean isDocsOrExamples(final File file) {
- final String path = file.getAbsolutePath();
+ final String path = file.getAbsolutePath().replace(File.separatorChar, '/');
return path.contains("/docs/") || path.contains("/examples/");
}
diff --git a/src/main/java/org/apache/tomee/website/Javadocs.java b/src/main/java/org/apache/tomee/website/Javadocs.java
index 33779f8..2040a41 100644
--- a/src/main/java/org/apache/tomee/website/Javadocs.java
+++ b/src/main/java/org/apache/tomee/website/Javadocs.java
@@ -94,16 +94,12 @@ public class Javadocs {
final File javadocOutput = sources.getGeneratedDestFor(source, "javadoc");
final ProcessBuilder cmd = new ProcessBuilder(
getJavadocCommand().getAbsolutePath(),
- "-tag",
- "example.en:a:Examples (en):",
- "-tag",
- "example.es:a:Examples (es):",
- "-tag",
- "example.pt:a:Examples (pt):",
- "-sourcepath",
- javaSources.getAbsolutePath(),
- "-d",
- javadocOutput.getAbsolutePath()
+ "-tag", "example.en:a:Examples (en):",
+ "-tag", "example.es:a:Examples (es):",
+ "-tag", "example.pt:a:Examples (pt):",
+ "-sourcepath", javaSources.getAbsolutePath(),
+ "-d", javadocOutput.getAbsolutePath(),
+ "-encoding", "utf-8"
);
Stream.of(javaSources.listFiles())
@@ -216,7 +212,7 @@ public class Javadocs {
.filter(source.getJavadocFilter()::exclude)
.forEach(file -> {
try {
- final String relativePath = file.getAbsolutePath().replaceAll(".*/src/main/java/", "");
+ final String relativePath = file.getAbsolutePath().replace(File.separatorChar, '/').replaceAll(".*/src/main/java/", "");
if (!wanted.test(relativePath)) return;
diff --git a/src/main/java/org/apache/tomee/website/Source.java b/src/main/java/org/apache/tomee/website/Source.java
index 79ffaeb..84cab92 100644
--- a/src/main/java/org/apache/tomee/website/Source.java
+++ b/src/main/java/org/apache/tomee/website/Source.java
@@ -225,11 +225,11 @@ public class Source {
}
public boolean include(final File file) {
- return include.matcher(file.getAbsolutePath()).matches();
+ return include.matcher(file.getAbsolutePath().replace(File.separatorChar, '/')).matches();
}
public boolean exclude(final File file) {
- return !exclude.matcher(file.getAbsolutePath()).matches();
+ return !exclude.matcher(file.getAbsolutePath().replace(File.separatorChar, '/')).matches();
}
}
}
diff --git a/src/main/java/org/apache/tomee/website/TomEEVersionReplacement.java b/src/main/java/org/apache/tomee/website/TomEEVersionReplacement.java
index 0bcb36f..7883476 100644
--- a/src/main/java/org/apache/tomee/website/TomEEVersionReplacement.java
+++ b/src/main/java/org/apache/tomee/website/TomEEVersionReplacement.java
@@ -42,7 +42,7 @@ public class TomEEVersionReplacement {
}
private boolean isDocsOrExamples(final File file) {
- final String path = file.getAbsolutePath();
+ final String path = file.getAbsolutePath().replace(File.separatorChar, '/');
return path.contains("/docs/") || path.contains("/examples/");
}