Maven structure

git-svn-id: https://svn.argeo.org/slc/trunk@2020 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
new file mode 100644 (file)
index 0000000..2d4071c
--- /dev/null
+++ b/integration-tests/pom.xml
@@ -0,0 +1,15 @@
+<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.slc</groupId>
+               <artifactId>argeo-slc</artifactId>
+               <version>0.11.2-SNAPSHOT</version>
+               <relativePath>../../org.argeo.slc</relativePath>
+       </parent>
+       <artifactId>argeo-slc-it</artifactId>
+       <packaging>pom</packaging>
+       <name>Argeo SLC Integration Tests</name>
+       <modules>
+               <module>org.argeo.slc.it.webapp</module>
+       </modules>
+</project>

diff --git a/pom.xml b/pom.xml
index 5160b267656154ae2a14ecc53509c48d86c2d34d..c1582c5c8cd90cd0496850f77d5cc04eb4123192 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,22 +11,7 @@
        <name>Argeo SLC All</name>
        <modules>
                <module>org.argeo.slc</module>
-<!--
-               <module>org.argeo.slc.core</module>
-               <module>org.argeo.slc.detached</module>
-               <module>org.argeo.slc.detached.ext.log4j</module>
-               <module>org.argeo.slc.detached.launcher</module>
-               <module>org.argeo.slc.agent</module>
-               <module>org.argeo.slc.hibernate</module>
-               <module>org.argeo.slc.example</module>
-               <module>org.argeo.slc.server</module>
-               <module>org.argeo.slc.dist</module>
--->
-               <!-- Deactivate to make check out more flexible
-               <module>eclipse/features/org.argeo.slc.ui.launch.feature</module>
-               -->
                <module>runtime</module>
-               <module>examples</module>
 
                <module>org.argeo.slc.detached.launcher</module>
                <module>org.argeo.slc.webapp</module>
@@ -55,9 +40,11 @@
        </build>
        <profiles>
                <profile>
-                       <id>withEclipseBuild</id>
+                       <id>fullBuild</id>
                        <modules>
                                <module>eclipse/features/org.argeo.slc.ui.launch.feature</module>
+                               <module>examples</module>
+                               <module>integration-tests</module>
                        </modules>
                </profile>
        </profiles>

diff --git a/runtime/pom.xml b/runtime/pom.xml
index b13a3c5721834155f9bec073f730831fb7bd0628..a7b7c651b6ef0ed9b73823b5980314ca87aead2e 100644 (file)
--- a/runtime/pom.xml
+++ b/runtime/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.slc</groupId>
@@ -21,4 +22,15 @@
                <module>org.argeo.slc.launcher</module>
                <module>org.argeo.slc.lib.detached</module>
        </modules>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <configuration>
+                                       <aggregate>true</aggregate>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
 </project>