Author: [email protected]
Date: Tue Apr 19 16:23:39 2011
New Revision: 996

Log:
AMDATU-117 decoupled remaining modules and renamed/cleared reactor

Modified:
   trunk/amdatu-auth/pom.xml
   trunk/amdatu-cassandra/pom.xml
   trunk/amdatu-cassandra/test-integration/   (props changed)
   trunk/amdatu-core/pom.xml
   trunk/amdatu-core/tenantuseradmindecorator/pom.xml
   trunk/amdatu-example/pom.xml
   trunk/amdatu-libraries/pom.xml
   trunk/amdatu-libraries/warsupport/pom.xml
   trunk/amdatu-opensocial/pom.xml
   trunk/amdatu-release/pom.xml
   trunk/amdatu-semanticweb/pom.xml
   trunk/amdatu-web/pom.xml
   trunk/integration-tests/pom.xml
   trunk/integration-tests/test-platform/   (props changed)
   trunk/integration-tests/test-platform/pom.xml
   trunk/pom.xml

Modified: trunk/amdatu-auth/pom.xml
==============================================================================
--- trunk/amdatu-auth/pom.xml   (original)
+++ trunk/amdatu-auth/pom.xml   Tue Apr 19 16:23:39 2011
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>1-test2-SNAPSHOT</version>
     <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <artifactId>org.amdatu.auth</artifactId>

Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml      (original)
+++ trunk/amdatu-cassandra/pom.xml      Tue Apr 19 16:23:39 2011
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>1-test2-SNAPSHOT</version>
     <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <groupId>org.amdatu</groupId>

Modified: trunk/amdatu-core/pom.xml
==============================================================================
--- trunk/amdatu-core/pom.xml   (original)
+++ trunk/amdatu-core/pom.xml   Tue Apr 19 16:23:39 2011
@@ -5,11 +5,12 @@
   <parent>
     <groupId>org.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>1-test2-SNAPSHOT</version>
     <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <groupId>org.amdatu</groupId>
   <artifactId>org.amdatu.core</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Amdatu Platform</name>
   <description>This module consists of all bundles that are part of the Amdatu 
Platform.</description>

Modified: trunk/amdatu-core/tenantuseradmindecorator/pom.xml
==============================================================================
--- trunk/amdatu-core/tenantuseradmindecorator/pom.xml  (original)
+++ trunk/amdatu-core/tenantuseradmindecorator/pom.xml  Tue Apr 19 16:23:39 2011
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.amdatu</groupId>
@@ -8,6 +9,7 @@
   </parent>
   <groupId>org.amdatu.core</groupId>
   <artifactId>tenantuseradmindecorator</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>Amdatu Core - Tenant UserAdmin Decorator</name>
   <description>This bundle adds a Tenant aspect to the UserAdmin 
service</description>

Modified: trunk/amdatu-example/pom.xml
==============================================================================
--- trunk/amdatu-example/pom.xml        (original)
+++ trunk/amdatu-example/pom.xml        Tue Apr 19 16:23:39 2011
@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>1-test2-SNAPSHOT</version>
+    <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <artifactId>org.amdatu.example</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
   <name>Amdatu Examples</name>
   <description>This module holds several examples</description>
   <packaging>pom</packaging>
 
+  <properties>
+    <rdf2go.version>4.7.3</rdf2go.version>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -74,6 +81,12 @@
 
   <dependencies>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${javax.servlet.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.amdatu.web</groupId>
       <artifactId>httpcontext</artifactId>
       <scope>provided</scope>

Modified: trunk/amdatu-libraries/pom.xml
==============================================================================
--- trunk/amdatu-libraries/pom.xml      (original)
+++ trunk/amdatu-libraries/pom.xml      Tue Apr 19 16:23:39 2011
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>1-test2-SNAPSHOT</version>
+    <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <groupId>org.amdatu</groupId>
   <artifactId>org.amdatu.libraries</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
   <name>Amdatu Libraries</name>
   <description>This module consists of all Amdatu libraries. Amdatu libraries 
are a set of utility classes which should be embedded by bundles using 
them.</description>
   <packaging>pom</packaging>
-  
+
   <modules>
     <module>utilities</module>
     <module>fsstorage</module>
     <module>warsupport</module>
   </modules>
-  
+
 </project>
\ No newline at end of file

Modified: trunk/amdatu-libraries/warsupport/pom.xml
==============================================================================
--- trunk/amdatu-libraries/warsupport/pom.xml   (original)
+++ trunk/amdatu-libraries/warsupport/pom.xml   Tue Apr 19 16:23:39 2011
@@ -12,8 +12,19 @@
   <packaging>jar</packaging>
   <name>Amdatu Libraries - War support</name>
   <description>Supporting classes for the Amdatu WAR assembly</description>
+
+  <properties>
+    <org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
+  </properties>
+
   <dependencies>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${javax.servlet.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
       <version>${org.apache.felix.main.version}</version>

Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml     (original)
+++ trunk/amdatu-opensocial/pom.xml     Tue Apr 19 16:23:39 2011
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>1-test2-SNAPSHOT</version>
     <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <artifactId>org.amdatu.opensocial</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
   <name>Amdatu Open Social</name>
   <description>This module consists of all Open Social related 
bundles</description>
   <packaging>pom</packaging>

Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml        (original)
+++ trunk/amdatu-release/pom.xml        Tue Apr 19 16:23:39 2011
@@ -4,10 +4,12 @@
   <parent>
     <groupId>org.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>1-test2-SNAPSHOT</version>
+    <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <packaging>pom</packaging>
   <artifactId>amdatu-release</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
   <name>Amdatu Release</name>
 
   <properties>

Modified: trunk/amdatu-semanticweb/pom.xml
==============================================================================
--- trunk/amdatu-semanticweb/pom.xml    (original)
+++ trunk/amdatu-semanticweb/pom.xml    Tue Apr 19 16:23:39 2011
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>1-test2-SNAPSHOT</version>
+    <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <artifactId>org.amdatu.semanticweb</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
   <name>Amdatu Semantic Web</name>
   <description>This module consists of all Semantic Web related 
bundles</description>
   <packaging>pom</packaging>
 
+  <properties>
+    <org.openrdf.sesame.version>2.3.2</org.openrdf.sesame.version>
+    <rdf2go.version>4.7.3</rdf2go.version>
+  </properties>
+  
   <dependencyManagement>
     <dependencies>
       <dependency>

Modified: trunk/amdatu-web/pom.xml
==============================================================================
--- trunk/amdatu-web/pom.xml    (original)
+++ trunk/amdatu-web/pom.xml    Tue Apr 19 16:23:39 2011
@@ -5,10 +5,11 @@
   <parent>
     <groupId>org.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>1-test2-SNAPSHOT</version>
     <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <artifactId>org.amdatu.web</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
   <name>Amdatu Web</name>
   <description>This module consists of all Web related bundles</description>
   <packaging>pom</packaging>

Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml     (original)
+++ trunk/integration-tests/pom.xml     Tue Apr 19 16:23:39 2011
@@ -4,7 +4,8 @@
   <parent>
     <groupId>org.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>1-test2-SNAPSHOT</version>
+    <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <groupId>org.amdatu</groupId>
   <artifactId>org.amdatu.test.integration</artifactId>

Modified: trunk/integration-tests/test-platform/pom.xml
==============================================================================
--- trunk/integration-tests/test-platform/pom.xml       (original)
+++ trunk/integration-tests/test-platform/pom.xml       Tue Apr 19 16:23:39 2011
@@ -14,6 +14,14 @@
 
   <properties>
     <pax.exam.version>1.2.3</pax.exam.version>
+    
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
+    
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
+    <org.apache.felix.http.version>2.2.0</org.apache.felix.http.version>
+    <org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
+    
<org.apache.sling.commons.mime.version>2.1.4</org.apache.sling.commons.mime.version>
+    
<org.apache.sling.commons.osgi.version>2.0.6</org.apache.sling.commons.osgi.version>
+    <pax.swissbox.version>1.3.0</pax.swissbox.version>
+    <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
   </properties>
 
   <dependencies>

Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml       (original)
+++ trunk/pom.xml       Tue Apr 19 16:23:39 2011
@@ -1,725 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.amdatu</groupId>
+    <artifactId>amdatu</artifactId>
+    <version>1-test2-SNAPSHOT</version>
+    <relativePath>amdatu-parent/pom.xml</relativePath>
+  </parent>
   <groupId>org.amdatu</groupId>
-  <artifactId>amdatu</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <artifactId>reactor</artifactId>
+  <version>1</version>
   <packaging>pom</packaging>
-  <name>Amdatu</name>
-  <description>Amdatu is an application platform</description>
+  <name>Amdatu Reactor</name>
+  <description>Amdatu Maven reactor</description>
   <url>http://wwwm.amdatu.org/</url>
   <inceptionYear>2010</inceptionYear>
-
-  <!--
-    Global properties specific for the entire platform build.
-    FIXME: Subproject specific configuration should not be here. Move it when 
they split off
-  -->
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-    <!--
-      Build properties
-    -->
-    <maven.dollar>$</maven.dollar>
-    <server.hostname>localhost</server.hostname>
-    <server.port>3737</server.port>
-    <server.port.secure>9090</server.port.secure>
-    <root.directory>./target</root.directory>
-    <conf.directory>${root.directory}/conf</conf.directory>
-    <work.directory.name>work</work.directory.name>
-    <work.directory>${root.directory}/${work.directory.name}</work.directory>
-    <deploy.directory.name>deploy</deploy.directory.name>
-    
<deploy.directory>${root.directory}/${deploy.directory.name}</deploy.directory>
-    <compiler.debug>true</compiler.debug>
-    <compiler.optimize>false</compiler.optimize>
-    <default.loglevel>WARNING</default.loglevel>
-
-    <default.tenants>
-      tenant1.id=Default
-      tenant1.name=Default tenant
-      tenant1.properties.hostname=${server.hostname}
-    </default.tenants>
-
-    <!-- JMX configuration -->
-    <jmxremote.port />
-    <jmxremote.ssl>false</jmxremote.ssl>
-    <jmxremote.authenticate>false</jmxremote.authenticate>
-
-    <!--
-      Version numbers of dependent libraries
-    -->
-    <javax.servlet.version>2.5</javax.servlet.version>
-    <org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
-    <org.osgi.version>4.2.0</org.osgi.version>
-    
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
-    <org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
-    
<org.apache.felix.file.install.version>3.1.10</org.apache.felix.file.install.version>
-    <org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
-    <org.apache.felix.http.version>2.2.0</org.apache.felix.http.version>
-    <pax.swissbox.version>1.3.0</pax.swissbox.version>
-    <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
-    
<org.apache.sling.commons.mime.version>2.1.4</org.apache.sling.commons.mime.version>
-    
<org.apache.sling.commons.osgi.version>2.0.6</org.apache.sling.commons.osgi.version>
-    
<org.apache.felix.dependencymanager.version>3.0.0-r1062017</org.apache.felix.dependencymanager.version>
-    
<org.apache.felix.metatype.version>1.0.4</org.apache.felix.metatype.version>
-    
<org.apache.felix.webconsole.version>3.1.2</org.apache.felix.webconsole.version>
-    
<org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version>
-    <org.apache.felix.shell.version>1.4.2</org.apache.felix.shell.version>
-    <org.apache.felix.gogo.version>0.6.0</org.apache.felix.gogo.version>
-    
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
-    <org.apache.wink.version>1.1.1-incubating</org.apache.wink.version>
-    <org.openrdf.sesame.version>2.3.2</org.openrdf.sesame.version>
-    <org.openrdf.elmo.version>1.5</org.openrdf.elmo.version>
-    <jsr311-api.version>1.1.1</jsr311-api.version>
-    <jstl.version>1.1.2</jstl.version>
-    <taglibs.version>1.1.2</taglibs.version>
-    <junit.version>4.8.1</junit.version>
-    <jmock.version>2.5.1</jmock.version>
-    <rdf2go.version>4.7.3</rdf2go.version>
-  </properties>
-
-  <prerequisites>
-    <maven>2.2.1</maven>
-  </prerequisites>
-
-  <licenses>
-    <license>
-      <name>GNU General Public License version 3</name>
-      <url>http://www.gnu.org/licenses/gpl.html</url>
-      <distribution>repo</distribution>
-      <comments>The GNU General Public License is a free, copyleft license for 
software and other kinds of works.</comments>
-    </license>
-  </licenses>
-
-  <ciManagement>
-    <system>bamboo</system>
-    <url>http://bamboo.amdatu.org/bamboo/</url>
-    <notifiers>
-      <notifier>
-        <type>mail</type>
-        <sendOnError>true</sendOnError>
-        <sendOnFailure>true</sendOnFailure>
-        <sendOnSuccess>false</sendOnSuccess>
-        <sendOnWarning>false</sendOnWarning>
-        <configuration>
-          <address>[email protected]</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-
-  <distributionManagement>
-    <snapshotRepository>
-      <name>Amdatu Nightly Builds</name>
-      <id>amdatu.nightly</id>
-      <url>dav:http://repository.amdatu.org/nightly</url>
-    </snapshotRepository>
-    <repository>
-      <name>Amdatu Distributions</name>
-      <id>amdatu.releases</id>
-      <url>dav:http://repository.amdatu.org/releases</url>
-    </repository>
-    <site>
-      <name>Amdatu Sites</name>
-      <id>amdatu.sites</id>
-      <url>dav:http://repository.amdatu.org/sites</url>
-    </site>
-  </distributionManagement>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://jira.amdatu.org/jira</url>
-  </issueManagement>
-
-  <mailingLists>
-    <mailingList>
-      <name>Amdatu users</name>
-      
<subscribe>http://lists.amdatu.org/mailman/listinfo/amdatu-users</subscribe>
-      
<unsubscribe>http://lists.amdatu.org/mailman/listinfo/amdatu-users</unsubscribe>
-      <post>[email protected]</post>
-      <archive>http://lists.amdatu.org/pipermail/amdatu-users</archive>
-    </mailingList>
-    <mailingList>
-      <name>Amdatu developers</name>
-      
<subscribe>http://lists.amdatu.org/mailman/listinfo/amdatu-developers</subscribe>
-      
<unsubscribe>http://lists.amdatu.org/mailman/listinfo/amdatu-developers</unsubscribe>
-      <post>[email protected]</post>
-      <archive>http://lists.amdatu.org/pipermail/amdatu-developers</archive>
-    </mailingList>
-    <mailingList>
-      <name>Subversion commits</name>
-      
<subscribe>http://lists.amdatu.org/mailman/listinfo/amdatu-commits</subscribe>
-      
<unsubscribe>http://lists.amdatu.org/mailman/listinfo/amdatu-commits</unsubscribe>
-      <post>[email protected]</post>
-      <archive>http://lists.amdatu.org/pipermail/amdatu-commits</archive>
-    </mailingList>
-  </mailingLists>
-
-  <scm>
-    
<connection>scm:svn:http://subversion.amdatu.org/svn/amdatu/trunk</connection>
-    
<developerConnection>scm:svn:http://subversion.amdatu.org/svn/amdatu/trunk</developerConnection>
-    <url>http://subversion.amdatu.org/viewvc/amdatu</url>
-  </scm>
-
-  <developers>
-    <developer>
-      <id>ivol</id>
-      <name>Ivo Ladage-van Doorn</name>
-      <email>[email protected]</email>
-      <organization>GX Software</organization>
-      <organizationUrl>http://gxsoftware.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>angelos</id>
-      <name>Angelo van der Sijpt</name>
-      <email>[email protected]</email>
-      <organization>Luminis</organization>
-      <organizationUrl>http://luminis.eu</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>marcelo</id>
-      <name>Marcel Offermans</name>
-      <email>[email protected]</email>
-      <organization>Luminis</organization>
-      <organizationUrl>http://luminis.eu</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>bramk</id>
-      <name>Bram de Kruijff</name>
-      <email>[email protected]</email>
-      <organization>GX Software</organization>
-      <organizationUrl>http://gxsoftware.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-  </developers>
-
-  <repositories>
-    <repository>
-      <id>amdatu.releases</id>
-      <name>Amdatu Release Repository</name>
-      <url>http://repository.amdatu.org/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>amdatu.external</id>
-      <name>Amdatu External Repository</name>
-      <url>http://repository.amdatu.org/maven2/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>amdatu.snapshots</id>
-      <name>Amdatu Snapshots Repository</name>
-      <url>http://repository.amdatu.org/nightly/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>riptano</id>
-      <name>Riptano Repository</name>
-      <url>http://mvn.riptano.com/content/repositories/riptano</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>com.springsource.repository.bundles.release</id>
-      <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle 
Releases</name>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>com.springsource.repository.bundles.external</id>
-      <name>SpringSource Enterprise Bundle Repository - External Bundle 
Releases</name>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>shorrockin.com</id>
-      <name>Shorrockin Repository</name>
-      <url>http://maven.shorrockin.com/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>java.net.com</id>
-      <name>Download java.net</name>
-      <url>http://download.java.net/maven/2</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>openrdf</id>
-      <name>OpenRDF</name>
-      <url>http://repo.aduna-software.org/maven2/releases</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>repo1</id>
-      <name>repo1</name>
-      <url>http://repo1.maven.org/maven2</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>oauth.googlecode.com</id>
-      <name>OAuth Google Code</name>
-      <url>http://oauth.googlecode.com/svn/code/maven</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>semweb4j-repo</id>
-      <name>Semweb4j.org maven repo</name>
-      <url>http://semweb4j.org/repo/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <!--
-    Here we manage the dependencies of all child projects
-  -->
-  <dependencyManagement>
-    <dependencies>
-
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <version>${org.osgi.version}</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.compendium</artifactId>
-        <version>${org.osgi.version}</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>${javax.servlet.version}</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.dependencymanager</artifactId>
-        <version>${org.apache.felix.dependencymanager.version}</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.ops4j.pax.useradmin</groupId>
-        <artifactId>pax-useradmin-service</artifactId>
-        <version>${pax.useradmin.version}</version>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.jmock</groupId>
-        <artifactId>jmock-junit4</artifactId>
-        <version>${jmock.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.dependencymanager</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <modules>
-    <module>amdatu-auth</module>
-    <module>amdatu-cassandra</module>
-    <module>amdatu-core</module>
-    <module>amdatu-example</module>
-    <module>amdatu-libraries</module>
-    <module>amdatu-opensocial</module>
-    <module>amdatu-release</module>
-    <module>amdatu-semanticweb</module>
-    <module>amdatu-web</module>
-    <module>integration-tests</module>
-  </modules>
-
-  <build>
-    <defaultGoal>test</defaultGoal>
-    
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
-
-
-    <!-- Here we manage the plugins of all child projects -->
-    <pluginManagement>
-      <plugins>
-
-        <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.4</version>
-        </plugin>
-
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-            <debug>${compiler.debug}</debug>
-            <optimize>${compiler.optimize}</optimize>
-          </configuration>
-        </plugin>
-
-        <!--
-          Specify the exact maven plugin version here, since some versions 
have issues with resource filtering in
-          versions 2.7 and 2.8 (see 
http://stackoverflow.com/questions/1397903/setting-project-for-eclipse-using-maven)
-        -->
-        <plugin>
-          <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-
-        <plugin>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.3.1</version>
-        </plugin>
-
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
-
-        <plugin>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.1</version>
-        </plugin>
-
-        <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.4.3</version>
-        </plugin>
-
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>2.1.1</version>
-        </plugin>
-
-        <plugin>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.2</version>
-        </plugin>
-
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.8.1</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <extensions>true</extensions>
-          <version>2.1.0</version>
-        </plugin>
-
-      </plugins>
-    </pluginManagement>
-
-    <plugins>
-
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <projectNameTemplate>[groupId].[artifactId]</projectNameTemplate>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-          
<branchBase>http://subversion.amdatu.org/svn/amdatu/branches</branchBase>
-          <tagBase>http://subversion.amdatu.org/svn/amdatu/tags</tagBase>
-          <scmCommentPrefix>[Amdatu release] </scmCommentPrefix>
-          <goals>install deploy</goals>
-          <releaseProfiles>build-release</releaseProfiles>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>-Xmx384m</argLine>
-          <systemPropertyVariables>
-            
<net.sourceforge.cobertura.datafile>${basedir}/target/cobertura/cobertura.ser</net.sourceforge.cobertura.datafile>
-            <java.io.tmpdir>${basedir}/target/iotemp</java.io.tmpdir>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-
-      <!--
-        Activate bundle plugin for handling bundle extension
-      -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-
-    </plugins>
-  </build>
-
-  <reporting>
-    <outputDirectory>target/site</outputDirectory>
-    <plugins>
-
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <linkXref>true</linkXref>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
-        <configuration>
-          <show>public</show>
-          <detectOfflineLinks>false</detectOfflineLinks>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <aggregate>false</aggregate>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <aggregate>false</aggregate>
-          <linkXref>true</linkXref>
-          <minimumTokens>100</minimumTokens>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <targetJdk>1.5</targetJdk>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.2</version>
-        <reportSets>
-          <reportSet>
-            <inherited>false</inherited>
-            <reports>
-              <report>cim</report>
-              <!-- <report>dependencies</report> -->
-              <!-- <report>dependency-convergence</report> -->
-              <report>dependency-management</report>
-              <report>index</report>
-              <report>issue-tracking</report>
-              <report>license</report>
-              <report>mailing-list</report>
-              <report>plugin-management</report>
-              <report>plugins</report>
-              <report>project-team</report>
-              <report>scm</report>
-              <report>summary</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>javancss-maven-plugin</artifactId>
-        <version>2.0-beta-2</version>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <formats>
-            <format>html</format>
-            <format>xml</format>
-          </formats>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-          <xmlOutput>true</xmlOutput>
-          <threshold>High</threshold>
-          <effort>Min</effort>
-          <visitors>FindDeadLocalStores,UnreadFields</visitors>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </reporting>
-
   <profiles>
     <profile>
-      <id>itest</id>
-      <build>
-        <defaultGoal>install</defaultGoal>
-      </build>
-    </profile>
-    <profile>
-      <id>deploy</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <build>
-        <defaultGoal>deploy</defaultGoal>
+        <defaultGoal>initialize</defaultGoal>
         <plugins>
           <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <inherited>true</inherited>
-            <configuration>
-              <show>private</show>
-              <nohelp>true</nohelp>
-            </configuration>
+            <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>attach-javadocs</id>
-                <phase>verify</phase>
+                <id>show-help</id>
+                <phase>initialize</phase>
                 <goals>
-                  <goal>jar</goal>
+                  <goal>run</goal>
                 </goals>
+                <configuration>
+                  <tasks>
+                    <echo>
+                <![CDATA[
+================================================
+Welcome to Amdatu!
+
+This project is organized in modules that manage
+their own software lifecycle. Generic configuration 
+is stored in the amdatu-parent.
+
+This reactor only provides a few convenience
+profiles that can be selected by using the -P
+commandline option.
+
+Supported profiles:
+
+  parent   - parent module only
+  platform - platform modules
+  projects - projects modules
+  all      - all modules
+================================================
+                  ]]>
+                    </echo>
+                  </tasks>
+                </configuration>
               </execution>
             </executions>
           </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>parent</id>
+      <modules>
+        <module>amdatu-parent</module>
+      </modules>
+      <build>
+        <defaultGoal>package</defaultGoal>
+      </build>
+    </profile>
 
-          <plugin>
-            <artifactId>maven-source-plugin</artifactId>
-            <inherited>true</inherited>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+    <profile>
+      <id>platform</id>
+      <modules>
+        <module>amdatu-core</module>
+        <module>amdatu-web</module>
+        <module>amdatu-libraries</module>
+        <module>amdatu-release</module>
+      </modules>
+      <build>
+        <defaultGoal>package</defaultGoal>
+      </build>
+    </profile>
 
-        </plugins>
+    <profile>
+      <id>projects</id>
+      <modules>
+        <module>amdatu-auth</module>
+        <module>amdatu-cassandra</module>
+        <module>amdatu-opensocial</module>
+        <module>amdatu-semanticweb</module>
+      </modules>
+      <build>
+        <defaultGoal>package</defaultGoal>
       </build>
     </profile>
+
+    <profile>
+      <id>all</id>
+      <modules>
+        <module>amdatu-auth</module>
+        <module>amdatu-cassandra</module>
+        <module>amdatu-core</module>
+        <module>amdatu-example</module>
+        <module>amdatu-libraries</module>
+        <module>amdatu-opensocial</module>
+        <module>amdatu-release</module>
+        <module>amdatu-semanticweb</module>
+        <module>amdatu-web</module>
+        <module>integration-tests</module>
+      </modules>
+      <build>
+        <defaultGoal>package</defaultGoal>
+      </build>
+    </profile>
+
   </profiles>
 </project>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits

Reply via email to