From 644f7559c3aa7f640b39e26c5fb6d32a27de6342 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 25 Oct 2012 16:07:58 +0000
Subject: [PATCH] Centralize resources definition

git-svn-id: https://svn.argeo.org/commons/trunk@5653 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 base/dep/pom.xml         | 18 ------------------
 base/plugins/pom.xml     | 31 +++++++++----------------------
 base/runtime/pom.xml     | 15 ---------------
 pom.xml                  | 20 ++++++++++++++++++++
 security/dep/pom.xml     |  8 --------
 security/modules/pom.xml |  4 +++-
 security/plugins/pom.xml | 34 +++++++++-------------------------
 security/runtime/pom.xml | 13 -------------
 server/plugins/pom.xml   | 16 ----------------
 server/runtime/pom.xml   | 13 -------------
 10 files changed, 41 insertions(+), 131 deletions(-)

diff --git a/base/dep/pom.xml b/base/dep/pom.xml
index f6330a237..4489dced7 100644
--- a/base/dep/pom.xml
+++ b/base/dep/pom.xml
@@ -18,25 +18,7 @@
 		<module>org.argeo.eclipse.dep.rcp</module>
 	</modules>
 	<build>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>*.inf</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<configuration>
-					<useLastCommittedRevision>false</useLastCommittedRevision>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/base/plugins/pom.xml b/base/plugins/pom.xml
index f8aad6515..9441e1e58 100644
--- a/base/plugins/pom.xml
+++ b/base/plugins/pom.xml
@@ -14,20 +14,16 @@
 		<module>org.argeo.osgi.ui.explorer</module>
 	</modules>
 	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>plugin.xml</include>
-					<include>META-INF/**</include>
-					<include>icons/**</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -39,15 +35,6 @@
 					</excludes>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/base/runtime/pom.xml b/base/runtime/pom.xml
index 51a48cdc6..099970b9a 100644
--- a/base/runtime/pom.xml
+++ b/base/runtime/pom.xml
@@ -19,19 +19,4 @@
 		<module>org.argeo.eclipse.ui.rcp</module>
 		<module>org.argeo.eclipse.ui.jcr</module>
 	</modules>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>plugin.xml</include>
-					<include>META-INF/**</include>
-					<include>icons/**</include>
-				</includes>
-			</resource>
-		</resources>
-	</build>
 </project>
diff --git a/pom.xml b/pom.xml
index 66523ef02..240af13a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,6 +337,26 @@ limitations under the License.
 				</plugin>
 			</plugins>
 		</pluginManagement>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>plugin.xml</include>
+					<include>META-INF/**</include>
+					<include>WEB-INF/**</include>
+					<include>icons/**</include>
+					<include>branding/**</include>
+					<include>*.properties</include>
+					<include>p2.inf</include>
+				</includes>
+				<excludes>
+					<exclude>build.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
diff --git a/security/dep/pom.xml b/security/dep/pom.xml
index d9241f43a..68339e751 100644
--- a/security/dep/pom.xml
+++ b/security/dep/pom.xml
@@ -18,14 +18,6 @@
 		<module>org.argeo.security.dep.node.rcp</module>
 	</modules>
 	<build>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>*.inf</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
diff --git a/security/modules/pom.xml b/security/modules/pom.xml
index d469f8506..95074346a 100644
--- a/security/modules/pom.xml
+++ b/security/modules/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
@@ -25,6 +26,7 @@
 				</includes>
 				<excludes>
 					<exclude>.*</exclude>
+					<exclude>.*/**</exclude>
 					<exclude>pom.xml</exclude>
 					<exclude>build.properties</exclude>
 				</excludes>
diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml
index 9ef2a6d42..45d76c7b1 100644
--- a/security/plugins/pom.xml
+++ b/security/plugins/pom.xml
@@ -18,23 +18,16 @@
 		<module>org.argeo.security.ui.rap</module>
 	</modules>
 	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>plugin.xml</include>
-					<include>security*.properties</include>
-					<include>plugin.properties</include>
-					<include>META-INF/**</include>
-					<include>branding/**</include>
-					<include>icons/**</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -46,15 +39,6 @@
 					</excludes>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml
index 17a957d79..b7e3f0994 100644
--- a/security/runtime/pom.xml
+++ b/security/runtime/pom.xml
@@ -17,17 +17,4 @@
 		<module>org.argeo.security.activemq</module>
 		<module>org.argeo.security.jackrabbit</module>
 	</modules>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>META-INF/**</include>
-				</includes>
-			</resource>
-		</resources>
-	</build>
 </project>
\ No newline at end of file
diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
index a2808db01..baeeaa2e0 100644
--- a/server/plugins/pom.xml
+++ b/server/plugins/pom.xml
@@ -15,22 +15,6 @@
 		<module>org.argeo.jcr.ui.explorer</module>
 	</modules>
 	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>plugin.xml</include>
-					<include>META-INF/**</include>
-					<include>icons/**</include>
-					<include>plugin.properties</include>
-					<!-- Specific -->
-					<include>jcrexplorer.properties</include>
-				</includes>
-			</resource>
-		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/server/runtime/pom.xml b/server/runtime/pom.xml
index 9f394401e..c4e647538 100644
--- a/server/runtime/pom.xml
+++ b/server/runtime/pom.xml
@@ -23,17 +23,4 @@
 		<module>org.argeo.server.jackrabbit</module>
 		<module>org.argeo.server.modeshape</module>
 	</modules>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>META-INF/**</include>
-				</includes>
-			</resource>
-		</resources>
-	</build>
 </project>
\ No newline at end of file
-- 
2.30.2