Skip to content

The Unified and Autonomous Development Platform

Mount sitemap.xml and sitemap.txt

Robin Shenf5bdec579224
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 95f302f31b..b60e348226 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -171,7 +171,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
private final GitService gitService;
- private final Collection<String> reservedNames = Sets.newHashSet("robots.txt", "sitemap.xml",
+ private final Collection<String> reservedNames = Sets.newHashSet("robots.txt", "sitemap.xml", "sitemap.txt",
"favicon.ico", "favicon.png", "logo.png", "wicket", "projects");
private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();
diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
index e4b0a6968b..2701acc07e 100644
--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
@@ -121,17 +121,27 @@ public class ProductServletConfigurator implements ServletConfigurator {
File assetsDir = new File(Bootstrap.getSiteDir(), "assets");
boolean hasCustomLogo = false;
+ boolean hasSiteMapTxt = false;
+ boolean hasSiteMapXml = false;
for (File file: assetsDir.listFiles()) {
if (file.isFile()) {
context.addServlet(new ServletHolder(new FileAssetServlet(assetsDir)), "/" + file.getName());
if (file.getName().equals("logo.png"))
hasCustomLogo = true;
+ else if (file.getName().equals("sitemap.xml"))
+ hasSiteMapXml = true;
+ else if (file.getName().equals("sitemap.txt"))
+ hasSiteMapTxt = true;
} else {
context.addServlet(new ServletHolder(new FileAssetServlet(file)), "/" + file.getName() + "/*");
}
}
if (!hasCustomLogo)
context.addServlet(new ServletHolder(new FileAssetServlet(assetsDir)), "/logo.png");
+ if (!hasSiteMapTxt)
+ context.addServlet(new ServletHolder(new FileAssetServlet(assetsDir)), "/sitemap.txt");
+ if (!hasSiteMapXml)
+ context.addServlet(new ServletHolder(new FileAssetServlet(assetsDir)), "/sitemap.xml");
context.addServlet(new ServletHolder(jerseyServlet), "/~api/*");
context.addServlet(new ServletHolder(serverServlet), "/~server");