From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 12 Dec 2018 10:53:44 +0000 (+0100)
Subject: Skip maven generated/copied theme resources
X-Git-Tag: argeo-commons-2.1.76~5
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=e6bb7ca0e48cdf30ae7d63bb1cf6c6960b303ba9;p=lgpl%2Fargeo-commons.git

Skip maven generated/copied theme resources
---

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java b/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java
index c256a6920..a3dce2f57 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java
@@ -81,7 +81,9 @@ public class Theme {
 	}
 
 	public void apply(Application application) {
-		for (String name : resources.keySet()) {
+		resources: for (String name : resources.keySet()) {
+			if (name.startsWith("target/"))
+				continue resources; // skip maven output
 			application.addResource(name, resources.get(name));
 			if (log.isDebugEnabled())
 				log.debug("Added resource " + name);