fix rap demo, remove LDAP plugin dependencies from the node default target plateform

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 753e8964392f685ecb4e2ff1abccd8d48a481394..a5b11d142f7ccf933a3186cf323f90e6336918ec 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
                <module>org.argeo.server.jcr</module>
                <!-- Eclipse -->
                <module>org.argeo.eclipse.ui</module>
-               <module>org.argeo.eclipse.ui.jcr</module>
                <module>org.argeo.eclipse.ui.rap</module>
                <module>org.argeo.eclipse.ui.rcp</module>
                <!-- Security -->
@@ -52,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>
@@ -61,7 +59,6 @@
                <module>org.argeo.security.ui.rap</module>
                <module>org.argeo.security.ui.rcp</module>
                <!-- Legacy -->
-               <module>org.argeo.support.junit</module>
                <module>org.argeo.server.core</module>
                <module>org.argeo.ext.jdbm</module>
                <!-- Dependencies and Distributions -->
@@ -107,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>
@@ -120,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>
@@ -129,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 -->
@@ -138,7 +155,18 @@ limitations under the License.
                                        <configuration>
                                                <source>1.6</source>
                                                <target>1.6</target>
+                                               <compilerId>eclipse</compilerId>
+                                               <!-- Hack to work around issues with generated annotations : -->
+                                               <generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
+                                               <generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
                                        </configuration>
+                                       <dependencies>
+                                               <dependency>
+                                                       <groupId>org.codehaus.plexus</groupId>
+                                                       <artifactId>plexus-compiler-eclipse</artifactId>
+                                                       <version>2.3</version>
+                                               </dependency>
+                                       </dependencies>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-source-plugin</artifactId>
@@ -219,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>
@@ -384,6 +413,15 @@ limitations under the License.
                        </plugin>
                </plugins>
        </build>
+       <!-- <dependencies> -->
+       <!-- <dependency> -->
+       <!-- <groupId>org.argeo.tp</groupId> -->
+       <!-- <artifactId>binaries</artifactId> -->
+       <!-- <type>pom</type> -->
+       <!-- <version>${version.argeo-distribution}</version> -->
+       <!-- <scope>compile</scope> -->
+       <!-- </dependency> -->
+       <!-- </dependencies> -->
        <dependencyManagement>
                <dependencies>
                        <dependency>