X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=a5b11d142f7ccf933a3186cf323f90e6336918ec;hb=af31868bf2f900d275ca6c00f36825e8da04447a;hp=536dd3e1023553dbbdc052dc41fb09c6c0fdb806;hpb=59fd3768e7925334805dca3825f6f87f082d9810;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 536dd3e10..a5b11d142 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,7 @@
 		<module>org.argeo.node.repo.jackrabbit</module>
 		<module>org.argeo.cms</module>
 		<!-- Standard Workbench Perspectives -->
-		<module>org.argeo.osgi.ui.explorer</module>
-		<module>org.argeo.jcr.ui.explorer</module>
+		<module>org.argeo.eclipse.ui.workbench</module>
 		<module>org.argeo.security.equinox</module>
 		<module>org.argeo.security.ui</module>
 		<module>org.argeo.security.ui.admin</module>
@@ -105,9 +104,17 @@ limitations under the License.
 				<version>2.8</version>
 			</extension>
 		</extensions>
+		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>ext/test</testSourceDirectory>
 		<resources>
 			<resource>
-				<directory>src/main/resources</directory>
+				<directory>src</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
 			</resource>
 			<resource>
 				<directory>.</directory>
@@ -118,6 +125,7 @@ limitations under the License.
 					<exclude>.*</exclude>
 					<exclude>.*/**</exclude>
 					<exclude>src/**</exclude>
+					<exclude>ext/**</exclude>
 					<exclude>target/**</exclude>
 					<exclude>bin/**</exclude>
 					<exclude>pom.xml</exclude>
@@ -127,6 +135,17 @@ limitations under the License.
 				</excludes>
 			</resource>
 		</resources>
+		<testResources>
+			<testResource>
+				<directory>ext/test</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</testResource>
+		</testResources>
 		<pluginManagement>
 			<plugins>
 				<!-- Maven -->
@@ -139,7 +158,7 @@ limitations under the License.
 						<compilerId>eclipse</compilerId>
 						<!-- Hack to work around issues with generated annotations : -->
 						<generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
-						<generatedTestSourcesDirectory>target/classes</generatedTestSourcesDirectory>
+						<generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
 					</configuration>
 					<dependencies>
 						<dependency>
@@ -228,6 +247,7 @@ limitations under the License.
 					<configuration>
 						<manifestLocation>META-INF</manifestLocation>
 						<instructions>
+							<_include>bnd.bnd</_include>
 							<Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
 							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 							<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>