You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ie...@apache.org on 2012/02/17 19:03:26 UTC

svn commit: r1245685 - in /james/app/trunk: pom.xml src/debian/control/conffiles src/debian/control/control src/debian/control/copyright

Author: ieugen
Date: Fri Feb 17 18:03:26 2012
New Revision: 1245685

URL: http://svn.apache.org/viewvc?rev=1245685&view=rev
Log:
JAMES-1343

- added copyright - incomplete
- libs are also included

Added:
    james/app/trunk/src/debian/control/conffiles
    james/app/trunk/src/debian/control/copyright
Modified:
    james/app/trunk/pom.xml
    james/app/trunk/src/debian/control/control

Modified: james/app/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/app/trunk/pom.xml?rev=1245685&r1=1245684&r2=1245685&view=diff
==============================================================================
--- james/app/trunk/pom.xml (original)
+++ james/app/trunk/pom.xml Fri Feb 17 18:03:26 2012
@@ -24,10 +24,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>james-server</artifactId>
-        <groupId>org.apache.james</groupId>
-        <version>3.0-beta4-SNAPSHOT</version>
-        <relativePath></relativePath>
+	<artifactId>james-server</artifactId>
+	<groupId>org.apache.james</groupId>
+	<version>3.0-beta4-SNAPSHOT</version>
+	<relativePath></relativePath>
     </parent>
 
     <groupId>org.apache.james</groupId>
@@ -39,222 +39,222 @@
     <description>An advanced email server.</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/james/app/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/app/trunk</developerConnection>
-        <url>http://svn.apache.org/repos/asf/james/app/trunk</url>
+	<connection>scm:svn:http://svn.apache.org/repos/asf/james/app/trunk</connection>
+	<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/app/trunk</developerConnection>
+	<url>http://svn.apache.org/repos/asf/james/app/trunk</url>
     </scm>
 
     <properties>
-        <james.server.version>${project.parent.version}</james.server.version>
+	<james.server.version>${project.parent.version}</james.server.version>
 
         <!-- For more details see -->
         <!-- http://java.sun.com/products/javamail/javadocs/javax/mail/internet/package-summary.html -->
-        <javamail.system-property1>-Dmail.mime.multipart.ignoremissingendboundary=true</javamail.system-property1>
-        <javamail.system-property2>-Dmail.mime.multipart.ignoremissingboundaryparameter=true</javamail.system-property2>
-        <javamail.system-property3>-Dmail.mime.ignoreunknownencoding=true</javamail.system-property3>
-        <javamail.system-property4>-Dmail.mime.uudecode.ignoreerrors=true</javamail.system-property4>
-        <javamail.system-property5>-Dmail.mime.uudecode.ignoremissingbeginend=true</javamail.system-property5>
-        <javamail.system-property6>-Dmail.mime.multipart.allowempty=true</javamail.system-property6>
-        <javamail.system-property7>-Dmail.mime.base64.ignoreerrors=true</javamail.system-property7>
-        <javamail.system-property8>-Dmail.mime.encodeparameters=true </javamail.system-property8>
-        <javamail.system-property9>-Dmail.mime.decodeparameters=true</javamail.system-property9>
-        <javamail.system-property10>-Dmail.mime.address.strict=false</javamail.system-property10>
-        <javamail.system-properties>${javamail.system-property1} ${javamail.system-property2} ${javamail.system-property3} ${javamail.system-property4} ${javamail.system-property5}
-            ${javamail.system-property6} ${javamail.system-property7} ${javamail.system-property8} ${javamail.system-property9} ${javamail.system-property10}
-        </javamail.system-properties>
+	<javamail.system-property1>-Dmail.mime.multipart.ignoremissingendboundary=true</javamail.system-property1>
+	<javamail.system-property2>-Dmail.mime.multipart.ignoremissingboundaryparameter=true</javamail.system-property2>
+	<javamail.system-property3>-Dmail.mime.ignoreunknownencoding=true</javamail.system-property3>
+	<javamail.system-property4>-Dmail.mime.uudecode.ignoreerrors=true</javamail.system-property4>
+	<javamail.system-property5>-Dmail.mime.uudecode.ignoremissingbeginend=true</javamail.system-property5>
+	<javamail.system-property6>-Dmail.mime.multipart.allowempty=true</javamail.system-property6>
+	<javamail.system-property7>-Dmail.mime.base64.ignoreerrors=true</javamail.system-property7>
+	<javamail.system-property8>-Dmail.mime.encodeparameters=true </javamail.system-property8>
+	<javamail.system-property9>-Dmail.mime.decodeparameters=true</javamail.system-property9>
+	<javamail.system-property10>-Dmail.mime.address.strict=false</javamail.system-property10>
+	<javamail.system-properties>${javamail.system-property1} ${javamail.system-property2} ${javamail.system-property3} ${javamail.system-property4} ${javamail.system-property5}
+	    ${javamail.system-property6} ${javamail.system-property7} ${javamail.system-property8} ${javamail.system-property9} ${javamail.system-property10}
+	</javamail.system-properties>
 
         <!-- JMX system properties -->
         <!-- For more details see -->
         <!-- http://download.oracle.com/javase/1.5.0/docs/guide/management/agent.html -->
-        <jmx.system-property1>-Dcom.sun.management.jmxremote=true</jmx.system-property1>
-        <jmx.system-property2>-Dcom.sun.management.jmxremote.authenticate=false</jmx.system-property2>
-        <jmx.system-properties>${jmx.system-property1} ${jmx.system-property2}</jmx.system-properties>
+	<jmx.system-property1>-Dcom.sun.management.jmxremote=true</jmx.system-property1>
+	<jmx.system-property2>-Dcom.sun.management.jmxremote.authenticate=false</jmx.system-property2>
+	<jmx.system-properties>${jmx.system-property1} ${jmx.system-property2}</jmx.system-properties>
 
-        <jvm.system-property1>-XX:+HeapDumpOnOutOfMemoryError</jvm.system-property1>
+	<jvm.system-property1>-XX:+HeapDumpOnOutOfMemoryError</jvm.system-property1>
 
         <!-- Use filesystem to copy message by default -->
-        <james.system-property1>-Djames.message.usememorycopy=false</james.system-property1>
-        <james.system-properties>${james.system-property1}</james.system-properties>
+	<james.system-property1>-Djames.message.usememorycopy=false</james.system-property1>
+	<james.system-properties>${james.system-property1}</james.system-properties>
         <!-- this name is used for James's folders on Debian systems and james user -->
-        <james.debian>james</james.debian>
+	<james.debian.user>james</james.debian.user>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-container-spring</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.osgi</groupId>
-                    <artifactId>spring-osgi-extender</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-lifecycle-spring</artifactId>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.osgi</groupId>
-                    <artifactId>spring-osgi-extender</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-container-spring</artifactId>
+	    <exclusions>
+		<exclusion>
+		    <groupId>org.springframework.osgi</groupId>
+		    <artifactId>spring-osgi-extender</artifactId>
+		</exclusion>
+		<exclusion>
+		    <groupId>org.osgi</groupId>
+		    <artifactId>org.osgi.core</artifactId>
+		</exclusion>
+	    </exclusions>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-lifecycle-spring</artifactId>
+	    <scope>runtime</scope>
+	    <exclusions>
+		<exclusion>
+		    <groupId>org.springframework.osgi</groupId>
+		    <artifactId>spring-osgi-extender</artifactId>
+		</exclusion>
+		<exclusion>
+		    <groupId>org.osgi</groupId>
+		    <artifactId>org.osgi.core</artifactId>
+		</exclusion>
+	    </exclusions>
+	</dependency>
         <!-- Runtime dependencies which will get included in the generated binary distribution -->
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-cli</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-daemon</groupId>
-            <artifactId>commons-daemon</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-spring</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jms</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-mailetcontainer-camel</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-mailbox-adapter</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-dnsservice-api</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-dnsservice-dnsjava</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-protocols-library</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-util</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-data-library</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-data-ldap</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-protocols-smtp</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-protocols-imap4</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-protocols-lmtp</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-protocols-pop3</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-fetchmail</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-queue-file</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-queue-jms</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-queue-activemq</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-mailets</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-cli</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.slf4j</groupId>
+	    <artifactId>slf4j-api</artifactId>
+	</dependency>
+	<dependency>
+	    <groupId>org.slf4j</groupId>
+	    <artifactId>slf4j-log4j12</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.slf4j</groupId>
+	    <artifactId>jcl-over-slf4j</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>commons-daemon</groupId>
+	    <artifactId>commons-daemon</artifactId>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.camel</groupId>
+	    <artifactId>camel-core</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.camel</groupId>
+	    <artifactId>camel-spring</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.xbean</groupId>
+	    <artifactId>xbean-spring</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+
+	<dependency>
+	    <groupId>org.springframework</groupId>
+	    <artifactId>spring-jms</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.springframework</groupId>
+	    <artifactId>spring-orm</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.springframework</groupId>
+	    <artifactId>spring-tx</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.springframework</groupId>
+	    <artifactId>spring-jdbc</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-mailetcontainer-camel</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-mailbox-adapter</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-dnsservice-api</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-dnsservice-dnsjava</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-protocols-library</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-util</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-data-library</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-data-ldap</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-protocols-smtp</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-protocols-imap4</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-protocols-lmtp</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-protocols-pop3</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-fetchmail</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-queue-file</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-queue-jms</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-queue-activemq</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-mailets</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
         <!-- Comment jackrabbit dependency to avoid lucene version clash with mailbox-lucene (JAMES-1297)
             <dependency>
             <groupId>org.apache.jackrabbit</groupId>
@@ -268,142 +268,142 @@
             </exclusions>
             </dependency>
         -->
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>apache-james-mailbox-jpa</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>apache-james-mailbox-spring</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>apache-james-mailbox-lucene</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>apache-james-mailbox-jcr</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>apache-james-mailbox-memory</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-data-file</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-data-jpa</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-data-jdbc</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-data-hbase</artifactId>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jruby</groupId>
-                    <artifactId>jruby-complete</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>james-server-data-jcr</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>apache-james-imap-processor</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+	<dependency>
+	    <groupId>org.apache.derby</groupId>
+	    <artifactId>derby</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>apache-james-mailbox-jpa</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>apache-james-mailbox-spring</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>apache-james-mailbox-lucene</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>apache-james-mailbox-jcr</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>apache-james-mailbox-memory</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-data-file</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-data-jpa</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-data-jdbc</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-data-hbase</artifactId>
+	    <scope>runtime</scope>
+	    <exclusions>
+		<exclusion>
+		    <groupId>org.jruby</groupId>
+		    <artifactId>jruby-complete</artifactId>
+		</exclusion>
+	    </exclusions>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>james-server-data-jcr</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
+	<dependency>
+	    <groupId>org.apache.james</groupId>
+	    <artifactId>apache-james-imap-processor</artifactId>
+	    <scope>runtime</scope>
+	</dependency>
     </dependencies>
 
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>appassembler-maven-plugin</artifactId>
-                <version>1.0</version>
-                <configuration>
+	<plugins>
+	    <plugin>
+		<groupId>org.codehaus.mojo</groupId>
+		<artifactId>appassembler-maven-plugin</artifactId>
+		<version>1.0</version>
+		<configuration>
                     <!-- Include etc/ in the beginning of the classpath declaration in the bin scripts -->
-                    <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
-                    <configurationDirectory>conf</configurationDirectory>
-                    <target>${project.build.directory}/appassembler</target>
-                    <repositoryLayout>flat</repositoryLayout>
-                    <repositoryName>lib</repositoryName>
-                    <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
-                    <environmentSetupFileName>setenv</environmentSetupFileName>
+		    <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+		    <configurationDirectory>conf</configurationDirectory>
+		    <target>${project.build.directory}/appassembler</target>
+		    <repositoryLayout>flat</repositoryLayout>
+		    <repositoryName>lib</repositoryName>
+		    <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+		    <environmentSetupFileName>setenv</environmentSetupFileName>
                     <!-- set some sane defaults for memory -->
-                    <extraJvmArguments>${jvm.system-property1} -Xms128m -Xmx512m ${jmx.system-properties} ${javamail.system-properties} ${james.system-properties}</extraJvmArguments>
+		    <extraJvmArguments>${jvm.system-property1} -Xms128m -Xmx512m ${jmx.system-properties} ${javamail.system-properties} ${james.system-properties}</extraJvmArguments>
                     <!-- Generate bin scripts for windows and unix per default -->
-                    <platforms>
-                        <platform>windows</platform>
-                        <platform>unix</platform>
-                    </platforms>
-                    <programs>
-                        <program>
-                            <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
+		    <platforms>
+			<platform>windows</platform>
+			<platform>unix</platform>
+		    </platforms>
+		    <programs>
+			<program>
+			    <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
                             <!-- call it only run because appassemble will add .bat by default on windows -->
-                            <name>run</name>
+			    <name>run</name>
                             <!-- Only generate windows bat script for this application -->
-                            <platforms>
-                                <platform>windows</platform>
-                            </platforms>
-                        </program>
-                        <program>
-                            <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
-                            <name>run.sh</name>
+			    <platforms>
+				<platform>windows</platform>
+			    </platforms>
+			</program>
+			<program>
+			    <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
+			    <name>run.sh</name>
                             <!-- Only generate unix shell script for this application -->
-                            <platforms>
-                                <platform>unix</platform>
-                            </platforms>
-                        </program>
+			    <platforms>
+				<platform>unix</platform>
+			    </platforms>
+			</program>
 
                         <!-- This create the scripts for the command line administration client. Maybe this should better be moved to the cli module, but I'm not sure yet -->
-                        <program>
-                            <mainClass>org.apache.james.cli.ServerCmd</mainClass>
+			<program>
+			    <mainClass>org.apache.james.cli.ServerCmd</mainClass>
                             <!-- call it only run because appassemble will add .bat by default on windows -->
-                            <name>james-cli</name>
+			    <name>james-cli</name>
                             <!-- Only generate windows bat script for this application -->
-                            <platforms>
-                                <platform>windows</platform>
-                            </platforms>
-                        </program>
-                        <program>
-                            <mainClass>org.apache.james.cli.ServerCmd</mainClass>
-                            <name>james-cli.sh</name>
+			    <platforms>
+				<platform>windows</platform>
+			    </platforms>
+			</program>
+			<program>
+			    <mainClass>org.apache.james.cli.ServerCmd</mainClass>
+			    <name>james-cli.sh</name>
                             <!-- Only generate unix shell script for the client -->
-                            <platforms>
-                                <platform>unix</platform>
-                            </platforms>
-                        </program>
-                    </programs>
-                    <daemons>
-                        <daemon>
-                            <id>james</id>
-                            <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
-                            <commandLineArguments>
-                                <commandLineArgument>start</commandLineArgument>
-                            </commandLineArguments>
-                            <platforms>
+			    <platforms>
+				<platform>unix</platform>
+			    </platforms>
+			</program>
+		    </programs>
+		    <daemons>
+			<daemon>
+			    <id>james</id>
+			    <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
+			    <commandLineArguments>
+				<commandLineArgument>start</commandLineArgument>
+			    </commandLineArguments>
+			    <platforms>
                                 <!--
                                     =======================================================================
 
@@ -466,199 +466,199 @@
                                     END Tanuki Software License ============================================
                                     ========================================================================
                                 -->
-                                <platform>jsw</platform>
-                            </platforms>
-                            <generatorConfigurations>
-                                <generatorConfiguration>
-                                    <generator>jsw</generator>
-                                    <includes>
-                                        <include>linux-x86-32</include>
-                                        <include>linux-x86-64</include>
-                                        <include>linux-ppc-64</include>
-                                        <include>macosx-x86-universal-32</include>
-                                        <include>macosx-ppc-32</include>
-                                        <include>solaris-sparc-32</include>
-                                        <include>solaris-sparc-64</include>
-                                        <include>solaris-x86-32</include>
-                                        <include>windows-x86-32</include>
-                                    </includes>
-
-                                    <configuration>
-                                        <property>
-                                            <name>configuration.directory.in.classpath.first</name>
-                                            <value>../conf</value>
-                                        </property>
-                                        <property>
-                                            <name>set.default.REPO_DIR</name>
-                                            <value>../lib</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.working.dir</name>
-                                            <value>.</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.logfile</name>
-                                            <value>log/wrapper.log</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.library.path</name>
-                                            <value>../lib</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.initmemory</name>
-                                            <value>128</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.maxmemory</name>
-                                            <value>512</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.1</name>
-                                            <value>${jvm.system-property1}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.2</name>
-                                            <value>${jmx.system-property1}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.3</name>
-                                            <value>${jmx.system-property2}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.4</name>
-                                            <value>${javamail.system-property1}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.5</name>
-                                            <value>${javamail.system-property2}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.6</name>
-                                            <value>${javamail.system-property3}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.7</name>
-                                            <value>${javamail.system-property4}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.8</name>
-                                            <value>${javamail.system-property5}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.9</name>
-                                            <value>${javamail.system-property6}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.10</name>
-                                            <value>${javamail.system-property7}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.11</name>
-                                            <value>${javamail.system-property8}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.12</name>
-                                            <value>${javamail.system-property9}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.13</name>
-                                            <value>${javamail.system-property10}</value>
-                                        </property>
-                                        <property>
-                                            <name>wrapper.java.additional.14</name>
-                                            <value>${james.system-property1}</value>
-                                        </property>
-                                    </configuration>
-                                </generatorConfiguration>
-                            </generatorConfigurations>
+				<platform>jsw</platform>
+			    </platforms>
+			    <generatorConfigurations>
+				<generatorConfiguration>
+				    <generator>jsw</generator>
+				    <includes>
+					<include>linux-x86-32</include>
+					<include>linux-x86-64</include>
+					<include>linux-ppc-64</include>
+					<include>macosx-x86-universal-32</include>
+					<include>macosx-ppc-32</include>
+					<include>solaris-sparc-32</include>
+					<include>solaris-sparc-64</include>
+					<include>solaris-x86-32</include>
+					<include>windows-x86-32</include>
+				    </includes>
+
+				    <configuration>
+					<property>
+					    <name>configuration.directory.in.classpath.first</name>
+					    <value>../conf</value>
+					</property>
+					<property>
+					    <name>set.default.REPO_DIR</name>
+					    <value>../lib</value>
+					</property>
+					<property>
+					    <name>wrapper.working.dir</name>
+					    <value>.</value>
+					</property>
+					<property>
+					    <name>wrapper.logfile</name>
+					    <value>log/wrapper.log</value>
+					</property>
+					<property>
+					    <name>wrapper.java.library.path</name>
+					    <value>../lib</value>
+					</property>
+					<property>
+					    <name>wrapper.java.initmemory</name>
+					    <value>128</value>
+					</property>
+					<property>
+					    <name>wrapper.java.maxmemory</name>
+					    <value>512</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.1</name>
+					    <value>${jvm.system-property1}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.2</name>
+					    <value>${jmx.system-property1}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.3</name>
+					    <value>${jmx.system-property2}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.4</name>
+					    <value>${javamail.system-property1}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.5</name>
+					    <value>${javamail.system-property2}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.6</name>
+					    <value>${javamail.system-property3}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.7</name>
+					    <value>${javamail.system-property4}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.8</name>
+					    <value>${javamail.system-property5}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.9</name>
+					    <value>${javamail.system-property6}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.10</name>
+					    <value>${javamail.system-property7}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.11</name>
+					    <value>${javamail.system-property8}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.12</name>
+					    <value>${javamail.system-property9}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.13</name>
+					    <value>${javamail.system-property10}</value>
+					</property>
+					<property>
+					    <name>wrapper.java.additional.14</name>
+					    <value>${james.system-property1}</value>
+					</property>
+				    </configuration>
+				</generatorConfiguration>
+			    </generatorConfigurations>
+
+			</daemon>
+		    </daemons>
+		</configuration>
+		<executions>
+		    <execution>
+			<id>make-appassemble</id>
+			<phase>package</phase>
+			<goals>
+			    <goal>assemble</goal>
+			    <goal>generate-daemons</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-antrun-plugin</artifactId>
+		<version>1.2</version>
+		<executions>
+		    <execution>
+			<phase>package</phase>
+			<configuration>
 
-                        </daemon>
-                    </daemons>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-appassemble</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>assemble</goal>
-                            <goal>generate-daemons</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.2</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <configuration>
-
-                            <tasks>
+			    <tasks>
                                 <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
                                     from the lib dir to make windows happy again
                                 -->
-                                <replace
-                                    file="${project.build.directory}/appassembler/bin/run.bat"
-                                    token="%BASEDIR%\lib"
-                                    value="..\lib" />
-                                <replace
-                                    file="${project.build.directory}/appassembler/bin/run.sh"
-                                    token="setenv"
-                                    value="setenv.sh" />
+				<replace
+				    file="${project.build.directory}/appassembler/bin/run.bat"
+				    token="%BASEDIR%\lib"
+				    value="..\lib" />
+				<replace
+				    file="${project.build.directory}/appassembler/bin/run.sh"
+				    token="setenv"
+				    value="setenv.sh" />
 
                                 <!-- this is needed because appassembler is not really smart on some settings -->
-                                <replace
-                                    file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf"
-                                    token="lib/wrapper.jar"
-                                    value="%REPO_DIR%/wrapper.jar" />
-                                <replace
-                                    file="${project.build.directory}/appassembler/jsw/james/bin/james"
-                                    token="logs"
-                                    value="var" />
+				<replace
+				    file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf"
+				    token="lib/wrapper.jar"
+				    value="%REPO_DIR%/wrapper.jar" />
+				<replace
+				    file="${project.build.directory}/appassembler/jsw/james/bin/james"
+				    token="logs"
+				    value="var" />
 
                                 <!-- copy the linux wrapper-linux-x86-32 to wrapper, so use it as default if no matching wrapper was found -->
-                                <copy
-                                    file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32"
-                                    tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper" />
+				<copy
+				    file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32"
+				    tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper" />
                                 <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
                                     from the lib dir to make windows happy again
                                 -->
-                                <replace
-                                    file="${project.build.directory}/appassembler/bin/james-cli.bat"
-                                    token="%BASEDIR%\lib"
-                                    value="..\lib" />
-                                <replace
-                                    file="${project.build.directory}/appassembler/bin/james-cli.sh"
-                                    token="setenv"
-                                    value="setenv.sh" />
-                            </tasks>
-
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
-                    <tarLongFileMode>gnu</tarLongFileMode>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+				<replace
+				    file="${project.build.directory}/appassembler/bin/james-cli.bat"
+				    token="%BASEDIR%\lib"
+				    value="..\lib" />
+				<replace
+				    file="${project.build.directory}/appassembler/bin/james-cli.sh"
+				    token="setenv"
+				    value="setenv.sh" />
+			    </tasks>
+
+			</configuration>
+			<goals>
+			    <goal>run</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
+
+	    <plugin>
+		<artifactId>maven-assembly-plugin</artifactId>
+		<configuration>
+		    <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
+		    <tarLongFileMode>gnu</tarLongFileMode>
+		</configuration>
+		<executions>
+		    <execution>
+			<id>make-assembly</id>
+			<phase>package</phase>
+			<goals>
+			    <goal>attached</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
 
             <!--
                 The signing process excludes the artifact created by this plugin.
@@ -666,60 +666,60 @@
                 If this is the case then releasing the war would require
                 reorganisation.
             -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>src/main/resources</directory>
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-war-plugin</artifactId>
+		<configuration>
+		    <webResources>
+			<resource>
+			    <directory>src/main/resources</directory>
                             <!-- override the destination directory for this resource -->
-                            <targetPath>WEB-INF/conf/</targetPath>
-                            <excludes>
-                                <exclude>log4j.properties</exclude>
-                                <exclude>**/lib/**</exclude>
-                            </excludes>
-                        </resource>
-                        <resource>
-                            <directory>src/main/resources</directory>
+			    <targetPath>WEB-INF/conf/</targetPath>
+			    <excludes>
+				<exclude>log4j.properties</exclude>
+				<exclude>**/lib/**</exclude>
+			    </excludes>
+			</resource>
+			<resource>
+			    <directory>src/main/resources</directory>
                             <!-- override the destination directory for this resource -->
-                            <targetPath>WEB-INF/classes/</targetPath>
-                            <includes>
-                                <include>log4j.properties</include>
-                            </includes>
-                        </resource>
-                        <resource>
-                            <directory>src/main/config/war</directory>
+			    <targetPath>WEB-INF/classes/</targetPath>
+			    <includes>
+				<include>log4j.properties</include>
+			    </includes>
+			</resource>
+			<resource>
+			    <directory>src/main/config/war</directory>
                             <!-- override the destination directory for this resource -->
-                            <targetPath>WEB-INF/conf/</targetPath>
+			    <targetPath>WEB-INF/conf/</targetPath>
 
-                        </resource>
-                        <resource>
-                            <directory>src/main/licensing/war</directory>
-                            <targetPath>META-INF</targetPath>
-                            <excludes>
-                                <exclude>licensing.xml</exclude>
-                            </excludes>
-                        </resource>
-                        <resource>
-                            <directory>.</directory>
-                            <targetPath>META-INF</targetPath>
-                            <includes>
-                                <include>README*</include>
-                            </includes>
-                        </resource>
-                    </webResources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-war</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>war</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+			</resource>
+			<resource>
+			    <directory>src/main/licensing/war</directory>
+			    <targetPath>META-INF</targetPath>
+			    <excludes>
+				<exclude>licensing.xml</exclude>
+			    </excludes>
+			</resource>
+			<resource>
+			    <directory>.</directory>
+			    <targetPath>META-INF</targetPath>
+			    <includes>
+				<include>README*</include>
+			    </includes>
+			</resource>
+		    </webResources>
+		</configuration>
+		<executions>
+		    <execution>
+			<id>make-war</id>
+			<phase>package</phase>
+			<goals>
+			    <goal>war</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
 
             <!-- be sure to start up james before run it -->
             <!--
@@ -777,123 +777,157 @@
                 </plugin>
             -->
 
-        </plugins>
+	</plugins>
 
     </build>
     
     <profiles>
-        <profile>
-            <id>make-deb</id>
-            <build>
+	<profile>
+	    <id>make-deb</id>
+	    <build>
                 <!-- copy resources and filter properties -->
-                <resources>
-                    <resource>
-                        <directory>src/debian/control</directory>
-                        <filtering>true</filtering>
-                        <includes>
-                            <include>control*</include>
-                        </includes>
-                        <targetPath>${project.build.directory}/debian/control</targetPath>
-                    </resource>
-                    <resource>
-                        <directory>src/main/resources</directory>
+		<resources>
+		    <resource>
+			<directory>src/debian/control</directory>
+			<filtering>true</filtering>
+			<includes>
+			    <include>*</include>
+			</includes>
+			<targetPath>${project.build.directory}/debian/control</targetPath>
+		    </resource>
+		    <resource>
+			<directory>src/main/resources</directory>
                             <!-- override the destination directory for this resource -->
-                        <targetPath>${project.build.directory}/debian/resources</targetPath>
-                        <includes>
-                            <include>**/*.*</include>
-                        </includes>
-                    </resource>
-                </resources>
-                <plugins>
-                    <plugin>
-                        <artifactId>jdeb</artifactId>
-                        <groupId>org.vafer</groupId>
-                        <version>0.9</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jdeb</goal>
-                                </goals>
-                                <configuration>
-                                    <deb>${project.build.directory}/${project.artifactId}_${project.version}_all.deb</deb>
-                                    <dataSet>
-                                        <data>
-                                            <src>${project.build.directory}/${project.build.finalName}.jar</src>
-                                            <type>file</type>
-                                            <mapper>
-                                                <type>file</type>
-                                                <prefix>/</prefix>
-                                            </mapper>
-                                            <mapper>
-                                                <type>perm</type>
-                                                <prefix>/usr/share/${james.debian}</prefix>
-                                                <user>root</user>
-                                                <group>root</group>
-                                            </mapper>
-                                        </data>
-                                        <!-- all files -->
-                                        <data>
-                                            <src>${project.basedir}/src/main/app</src>
-                                            <type>directory</type>
-                                            <includes>*</includes>
-                                            <excludes>**/.svn</excludes>
-                                            <mapper>
-                                                <type>directory</type>
-                                                <prefix>/usr/share/${james.debian}</prefix>
-                                            </mapper>
-                                            <mapper>
-                                                <type>perm</type>
-                                                <prefix>/usr/share/${james.debian}</prefix>
-                                                <user>root</user>
-                                                <group>root</group>
-                                            </mapper>
-                                        </data>
-                                        <!-- conf files - in the future: move them to /usr/share/james/conf 
-                                        and provide sym-links to them as needed by lintian -->
-                                        <data>
-                                            <src>${project.build.directory}/debian/resources</src>
-                                            <type>directory</type>
-                                            <includes>*</includes>
-                                            <excludes>**/.svn</excludes>
-                                            <mapper>
-                                                <type>directory</type>
-                                                <prefix>/etc/${james.debian}</prefix>
-                                            </mapper>
-                                            <mapper>
-                                                <type>perm</type>
-                                                <prefix>/etc/${james.debian}</prefix>
-                                                <user>root</user>
-                                                <group>root</group>
-                                            </mapper>
-                                        </data>
+			<targetPath>${project.build.directory}/debian/resources</targetPath>
+			<includes>
+			    <include>**/*.*</include>
+			</includes>
+		    </resource>
+		</resources>
+		<plugins>
+		    <plugin>
+			<artifactId>jdeb</artifactId>
+			<groupId>org.vafer</groupId>
+			<version>0.9</version>
+			<executions>
+			    <execution>
+				<phase>package</phase>
+				<goals>
+				    <goal>jdeb</goal>
+				</goals>
+				<configuration>
+				    <deb>${project.build.directory}/${project.artifactId}_${project.version}_all.deb</deb>
+				    <dataSet>
+					<data>
+					    <src>${project.build.directory}/${project.build.finalName}.jar</src>
+					    <type>file</type>
+					    <mapper>
+						<type>file</type>
+						<prefix>/</prefix>
+					    </mapper>
+					    <mapper>
+						<type>perm</type>
+						<prefix>/usr/share/${project.artifactId}</prefix>
+						<user>root</user>
+						<group>root</group>
+						<filemode>644</filemode>
+					    </mapper>
+					</data>
+                                        <!-- all files and dirs -->
+					<data>
+					    <src>${project.basedir}/src/main/app</src>
+					    <type>directory</type>
+					    <includes>*</includes>
+					    <excludes>**/.svn</excludes>
+					    <mapper>
+						<type>directory</type>
+						<prefix>/usr/share/${project.artifactId}</prefix>
+					    </mapper>
+					    <mapper>
+						<type>perm</type>
+						<prefix>/usr/share/${project.artifactId}</prefix>
+						<user>root</user>
+						<group>root</group>
+						<filemode>755</filemode>
+					    </mapper>
+					</data>
+                                       <!-- conf files - in the future: move them to /usr/share/james/conf ?? -->
+					<data>
+					    <src>${project.build.directory}/debian/resources</src>
+					    <type>directory</type>
+					    <includes>*</includes>
+					    <excludes>**/.svn</excludes>
+					    <mapper>
+						<type>directory</type>
+						<prefix>/etc/${project.artifactId}</prefix>
+					    </mapper>
+					    <mapper>
+						<type>perm</type>
+						<prefix>/etc/${project.artifactId}</prefix>
+						<user>root</user>
+						<group>root</group>
+						<filemode>644</filemode>
+					    </mapper>
+					</data>
                                         <!-- package documentation files (realease info, install, no javadoc) -->
-                                        <data>
-                                            <src>${project.basedir}</src>
-                                            <type>directory</type>
-                                            <includes>LICENSE,README.txt,README.crypto,NOTICE</includes>
-                                            <mapper>
-                                                <type>directory</type>
-                                                <prefix>/usr/share/doc/${james.debian}</prefix>
-                                            </mapper>
-                                            <mapper>
-                                                <type>perm</type>
-                                                <prefix>/usr/share/doc/${james.debian}</prefix>
-                                                <user>root</user>
-                                                <group>root</group>
-                                            </mapper>
-                                        </data>                                        
-                                    </dataSet>
-                                    <controlDir>${project.build.directory}/debian/control</controlDir>
-                                    <changesIn>${project.basedir}README.txt</changesIn>
-                                    <changesOut>${project.build.directory}/${project.build.finalName}.changes</changesOut>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
+					<data>
+					    <src>${project.basedir}</src>
+					    <type>directory</type>
+					    <includes>README.txt,README.crypto,NOTICE</includes>
+					    <mapper>
+						<type>directory</type>
+						<prefix>/usr/share/doc/${project.artifactId}</prefix>
+					    </mapper>
+					    <mapper>
+						<type>perm</type>
+						<prefix>/usr/share/doc/${project.artifactId}</prefix>
+						<user>root</user>
+						<group>root</group>
+						<filemode>644</filemode>
+					    </mapper>
+					</data>
+					<data>
+					    <src>${project.build.directory}/debian/control/copyright</src>
+					    <type>file</type>
+					    <mapper>
+						<type>file</type>
+						<prefix>/</prefix>
+					    </mapper>
+					    <mapper>
+						<type>perm</type>
+						<prefix>/usr/share/doc/${project.artifactId}</prefix>
+						<user>root</user>
+						<group>root</group>
+						<filemode>644</filemode>
+					    </mapper>
+					</data>
+                                       <!-- libs -->
+					<data>
+					    <src>${project.build.directory}/appassembler/lib</src>
+					    <type>directory</type>
+					    <mapper>
+						<type>directory</type>
+						<prefix>/usr/share/${project.artifactId}/lib</prefix>
+					    </mapper>
+					    <mapper>
+						<type>perm</type>
+						<prefix>/usr/share/${project.artifactId}/lib</prefix>
+						<user>root</user>
+						<group>root</group>
+						<filemode>644</filemode>
+					    </mapper>
+					</data>
+				    </dataSet>
+				    <controlDir>${project.build.directory}/debian/control</controlDir>
+				    <changesIn>${project.basedir}README.txt</changesIn>
+				    <changesOut>${project.build.directory}/${project.build.finalName}.changes</changesOut>
+				</configuration>
+			    </execution>
+			</executions>
+		    </plugin>
+		</plugins>
+	    </build>
+	</profile>
     </profiles>
     
 </project>

Added: james/app/trunk/src/debian/control/conffiles
URL: http://svn.apache.org/viewvc/james/app/trunk/src/debian/control/conffiles?rev=1245685&view=auto
==============================================================================
--- james/app/trunk/src/debian/control/conffiles (added)
+++ james/app/trunk/src/debian/control/conffiles Fri Feb 17 18:03:26 2012
@@ -0,0 +1,18 @@
+/etc/${project.artifactId}/dnsservice.xml
+/etc/${project.artifactId}/domainlist.xml
+/etc/${project.artifactId}/fetchmail.xml
+/etc/${project.artifactId}/hbase-site.xml
+/etc/${project.artifactId}/imapserver.xml
+/etc/${project.artifactId}/jcr-repository.xml
+/etc/${project.artifactId}/jmx.properties
+/etc/${project.artifactId}/lmtpserver.xml
+/etc/${project.artifactId}/log4j.properties
+/etc/${project.artifactId}/mailbox.xml
+/etc/${project.artifactId}/mailetcontainer.xml
+/etc/${project.artifactId}/mailrepositorystore.xml
+/etc/${project.artifactId}/pop3server.xml
+/etc/${project.artifactId}/recipientrewritetable.xml
+/etc/${project.artifactId}/smtpserver.xml
+/etc/${project.artifactId}/sqlResources.xml
+/etc/${project.artifactId}/usersrepository.xml
+/etc/${project.artifactId}/usersrepository23.xml

Modified: james/app/trunk/src/debian/control/control
URL: http://svn.apache.org/viewvc/james/app/trunk/src/debian/control/control?rev=1245685&r1=1245684&r2=1245685&view=diff
==============================================================================
--- james/app/trunk/src/debian/control/control (original)
+++ james/app/trunk/src/debian/control/control Fri Feb 17 18:03:26 2012
@@ -6,9 +6,10 @@ Architecture: all
 Depends: java6-runtime
 Maintainer: Apache James Team <se...@james.apache.org>
 Description: Hi-performance, modular and extensible Java based email server.
-  The Apache James Project delivers a rich set of open source modules and libraries,
- written in Java, related to Internet mail communication which build into an advanced
- enterprise mail server.
+  The Apache James Project delivers a rich set of open source modules and 
+ libraries, written in Java, related to Internet mail communication which build
+ into an advanced enterprise mail server.
  James Server provides a mailet container: the email processing is delegated to 
- independent, extensible, pluggable agents specified by the Mailet API. Any function 
- which is not already available (from James or from a third party) can be developed.
+ independent, extensible, pluggable agents specified by the Mailet API. Any 
+ function which is not already available (from James or from a third party) can
+ be developed.

Added: james/app/trunk/src/debian/control/copyright
URL: http://svn.apache.org/viewvc/james/app/trunk/src/debian/control/copyright?rev=1245685&view=auto
==============================================================================
--- james/app/trunk/src/debian/control/copyright (added)
+++ james/app/trunk/src/debian/control/copyright Fri Feb 17 18:03:26 2012
@@ -0,0 +1,26 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: Apache James
+Source: http://james.apache.org/server/3/
+
+Files: *
+Copyright:  1998-2012 Apache Software Foundation
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org