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 rd...@apache.org on 2011/08/28 16:02:28 UTC
svn commit: r1162525 - in /james/app/trunk: ./ src/assemble/
src/main/licensing/ src/main/licensing/app/ src/main/licensing/war/ src/mpt/
Author: rdonkin
Date: Sun Aug 28 14:02:27 2011
New Revision: 1162525
URL: http://svn.apache.org/viewvc?rev=1162525&view=rev
Log:
Merged in http://svn.apache.org/repos/asf/james/app/branches/3_0_beta3
Added:
james/app/trunk/src/assemble/app.xml
- copied, changed from r1162482, james/app/branches/3_0_beta3/src/assemble/app.xml
james/app/trunk/src/main/licensing/app/
- copied from r1162482, james/app/branches/3_0_beta3/src/main/licensing/app/
james/app/trunk/src/main/licensing/app/license-for-binary.txt
- copied unchanged from r1162482, james/app/branches/3_0_beta3/src/main/licensing/app/license-for-binary.txt
james/app/trunk/src/main/licensing/app/licensing.xml
- copied unchanged from r1162482, james/app/branches/3_0_beta3/src/main/licensing/app/licensing.xml
james/app/trunk/src/main/licensing/app/notice-for-binary.txt
- copied unchanged from r1162482, james/app/branches/3_0_beta3/src/main/licensing/app/notice-for-binary.txt
james/app/trunk/src/main/licensing/war/
- copied from r1162482, james/app/branches/3_0_beta3/src/main/licensing/war/
james/app/trunk/src/main/licensing/war/LICENSE
- copied unchanged from r1162482, james/app/branches/3_0_beta3/src/main/licensing/war/LICENSE
james/app/trunk/src/main/licensing/war/NOTICE
- copied unchanged from r1162482, james/app/branches/3_0_beta3/src/main/licensing/war/NOTICE
james/app/trunk/src/main/licensing/war/licensing.xml
- copied unchanged from r1162482, james/app/branches/3_0_beta3/src/main/licensing/war/licensing.xml
Modified:
james/app/trunk/ (props changed)
james/app/trunk/README.crypto (props changed)
james/app/trunk/README.txt (contents, props changed)
james/app/trunk/pom.xml
james/app/trunk/src/assemble/bin.xml
james/app/trunk/src/main/licensing/license-for-binary.txt
james/app/trunk/src/main/licensing/notice-for-binary.txt
james/app/trunk/src/mpt/adduser.mpt
james/app/trunk/src/mpt/john.smith.sieve
Propchange: james/app/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 28 14:02:27 2011
@@ -1,2 +1,3 @@
+/james/app/branches/3_0_beta3:1146821-1162482
/james/server/sandbox/active/mina_experiments/container-spring:824613-825114
/james/server/sandbox/active/pure_spring_deployment/container-spring:893986-896410
Propchange: james/app/trunk/README.crypto
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 28 14:02:27 2011
@@ -1,2 +1,3 @@
+/james/app/branches/3_0_beta3/README.crypto:1146821-1162482
/james/server/sandbox/active/mina_experiments/README.crypto:824613-825114
/james/server/sandbox/active/pure_spring_deployment/README.crypto:893986-896410
Modified: james/app/trunk/README.txt
URL: http://svn.apache.org/viewvc/james/app/trunk/README.txt?rev=1162525&r1=1162524&r2=1162525&view=diff
==============================================================================
--- james/app/trunk/README.txt (original)
+++ james/app/trunk/README.txt Sun Aug 28 14:02:27 2011
@@ -1,17 +1,27 @@
### http://james.apache.org/server/3/ ###
-Thank you for testing Apache James Server 3.0-beta1!
+Thank you for testing Apache James Server 3.0-beta3!
- * What's new in 3.0-beta1 for end users
- - Numerous IMAP bug fixes (better client support, memory improvement, NIO and IO support...)
- - Support for IMAP IDLE (RFC 2177, server transmit updates to the client in real time)
- - Support for IMAP User Flags
- - Support for IMAP WITHIN Extensions (RFC 5032)
- - Support for IMAP SEARCHRES
- - Support for IMAP AUTH=PLAIN
- - Support for IMAP ENABLE
- - Support for IMAP ESEARCH
- - Support for IMAP I18NLEVEL=1
+ * What's new in 3.0-beta3 for end users
+ - IMAP version 0.2.1
+ * Numerous IMAP bug fixes (better client support, memory improvement, NIO and IO support...)
+ * Now supports
+ IMAP IDLE (RFC 2177, server transmit updates to the client in real time)
+ IMAP User Flags
+ IMAP WITHIN Extensions (RFC 5032)
+ IMAP SEARCHRES
+ IMAP AUTH=PLAIN
+ IMAP ENABLE
+ IMAP ESEARCH
+ IMAP I18NLEVEL=1
+ SASL-IR
+ - Mailbox version 0.3
+ * New Features
+ Out-of-the box support for quotas
+ Support for modify-sequence
+ * Improved search using Lucene
+ * Numerous bug fixes and improvements
+ * For details, see https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311221&version=12316446
- Telnet Management has been removed in favor of JMX with client shell
- More metrics counters available via JMX
- JPA validated against more databases (among others Oracle)
@@ -26,16 +36,15 @@ Thank you for testing Apache James Serve
- Mailing list functionality has been removed
- More documentation on web site for configuration,...
- Java 1.6 mandatory
- - ... and much more, see details on https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10411&version=12315512
- * What's new in 3.0-beta1 for developers
+ - ... and much more see details on https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10411&version=12316850
+ * What's new in 3.0-beta3 for developers
- Less maven modules
- Maven 3.0.2 required to build
- Upgrade to latest frameworks versions (netty, activemq, jackrabbit...)
- Code reports generation via 'mvn site -P site-reports' maven profile
- Corrections further to findbugs,... reports
- Code formatting
- - ... and much more, see details on https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10411&version=12315512
-
+ - ... and much more, see details on https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10411&version=12316850
* Quick Start http://james.apache.org/server/3/quick-start.html
* Install http://james.apache.org/server/3/install.html
Propchange: james/app/trunk/README.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 28 14:02:27 2011
@@ -1,2 +1,3 @@
+/james/app/branches/3_0_beta3/README.txt:1146821-1162482
/james/server/sandbox/active/mina_experiments/README.txt:824613-825114
/james/server/sandbox/active/pure_spring_deployment/README.txt:893986-896410
Modified: james/app/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/app/trunk/pom.xml?rev=1162525&r1=1162524&r2=1162525&view=diff
==============================================================================
--- james/app/trunk/pom.xml (original)
+++ james/app/trunk/pom.xml Sun Aug 28 14:02:27 2011
@@ -1,690 +1,889 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
--->
-<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">
- <parent>
- <artifactId>james-server</artifactId>
- <groupId>org.apache.james</groupId>
- <version>3.0-beta4-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james</artifactId>
- <packaging>pom</packaging>
- <name>Apache James Server</name>
- <description>An advanced email server.</description>
- <properties>
- </properties>
-
-
- <build>
- <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>
- <!-- set some sane defaults for memory -->
- <extraJvmArguments>-Xms128m -Xmx512m -Djava.system.class.loader=org.apache.james.container.spring.context.JamesClassLoader ${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.container.spring.Main</mainClass>
- <!-- call it only run because appassemble will add .bat by default on windows -->
- <name>run</name>
- <!-- Only generate windows bat script for this application -->
- <platforms>
- <platform>windows</platform>
- </platforms>
- </program>
- <program>
- <mainClass>org.apache.james.container.spring.Main</mainClass>
- <name>run.sh</name>
- <!-- Only generate unix shell script for this application -->
- <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>
- <!-- call it only run because appassemble will add .bat by default on windows -->
- <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>
- <!-- Only generate unix shell script for the client -->
- <platforms>
- <platform>unix</platform>
- </platforms>
- </program>
- </programs>
- <daemons>
- <daemon>
- <id>james</id>
- <mainClass>org.apache.james.container.spring.Main</mainClass>
- <commandLineArguments>
- <commandLineArgument>start</commandLineArgument>
- </commandLineArguments>
- <platforms>
-<!--
-=======================================================================
-
-JSW relies on software licensed under the following "Tanuki Software License"
-
-BEGIN Tanuki Software License =========================================
- Copyright (c) 1999, 2006 Tanuki Software, Inc.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of the Java Service Wrapper and associated
- documentation files (the "Software"), to deal in the Software
- without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sub-license,
- and/or sell copies of the Software, and to permit persons to
- whom the Software is furnished to do so, subject to the
- following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-
- Portions of the Software have been derived from source code
- developed by Silver Egg Technology under the following license:
-
- BEGIN Silver Egg Techology License =================================
-
- Copyright (c) 2001 Silver Egg Technology
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sub-license, and/or
- sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- END Silver Egg Techology License =====================================
-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>-Djava.system.class.loader=org.apache.james.container.spring.context.JamesClassLoader</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>
-
- <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" />
-
- <!-- 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" />
-
- <!-- 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" />
- <!-- 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>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>src/main/config/james</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/config/james</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>
- <!-- override the destination directory for this resource -->
- <targetPath>WEB-INF/conf/</targetPath>
-
- </resource>
- <resource>
- <!--
- An inelegant and fagile way to add LICENSE, NOTICE and DEPENDENCIES.
- Is there a better way?
- -->
- <directory>target/maven-shared-archive-resources</directory>
- </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 -->
- <!--
- <plugin>
- <groupId>org.apache.james</groupId>
- <artifactId>maven-mpt-plugin</artifactId>
- <version>0.2-SNAPSHOT</version>
- <configuration>
- <mailProtocolTests>
- <mailProtocolTest>
- <host>127.0.0.1</host>
- <port>110</port>
- <scriptFile>src/mpt/pop3.mpt</scriptFile>
- <addUsers>
- <addUser>
- <host>127.0.0.1</host>
- <port>4555</port>
- <scriptFile>src/mpt/adduser.mpt</scriptFile>
- <user>root</user>
- <passwd>root</passwd>
- </addUser>
- </addUsers>
- </mailProtocolTest>
- <mailProtocolTest>
- <host>127.0.0.1</host>
- <port>143</port>
- <scriptFile>src/mpt/imap.mpt</scriptFile>
- <addUsers>
- <addUser>
- <host>127.0.0.1</host>
- <port>4555</port>
- <scriptFile>src/mpt/adduser.mpt</scriptFile>
- <user>root</user>
- <passwd>root</passwd>
- </addUser>
- </addUsers>
- </mailProtocolTest>
- <mailProtocolTest>
- <host>127.0.0.1</host>
- <port>25</port>
- <scriptFile>src/mpt/smtp.mpt</scriptFile>
- <addUsers>
- <addUser>
- <host>127.0.0.1</host>
- <port>4555</port>
- <scriptFile>src/mpt/adduser.mpt</scriptFile>
- <user>root</user>
- <passwd>root</passwd>
- </addUser>
- </addUsers>
- </mailProtocolTest>
- </mailProtocolTests>
-
- </configuration>
- </plugin>
- -->
-
- </plugins>
-
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-container-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-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-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>runtime</scope>
- </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-ldap</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-smtpserver</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imapserver</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-lmtpserver</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-pop3server</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-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.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </exclusion>
- </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>
- </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-file</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-jpa</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-hbase</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-jdbc</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-jcr</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-processor</artifactId>
- <scope>runtime</scope>
- </dependency>
-
-
- </dependencies>
-</project>
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+<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">
+ <parent>
+ <artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>3.0-beta4-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james</artifactId>
+ <version>3.0-beta4-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache James Server</name>
+ <description>An advanced email server.</description>
+ <properties>
+ </properties>
+
+ <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>
+ </scm>
+
+
+ <build>
+ <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>
+ <!-- set some sane defaults for memory -->
+ <extraJvmArguments>-Xms128m -Xmx512m -Djava.system.class.loader=org.apache.james.container.spring.context.JamesClassLoader ${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.container.spring.Main</mainClass>
+ <!-- call it only run because appassemble will add .bat by default on windows -->
+ <name>run</name>
+ <!-- Only generate windows bat script for this application -->
+ <platforms>
+ <platform>windows</platform>
+ </platforms>
+ </program>
+ <program>
+ <mainClass>org.apache.james.container.spring.Main</mainClass>
+ <name>run.sh</name>
+ <!-- Only generate unix shell script for this application -->
+ <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>
+ <!-- call it only run because appassemble will add .bat by default on windows -->
+ <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>
+ <!-- Only generate unix shell script for the client -->
+ <platforms>
+ <platform>unix</platform>
+ </platforms>
+ </program>
+ </programs>
+ <daemons>
+ <daemon>
+ <id>james</id>
+ <mainClass>org.apache.james.container.spring.Main</mainClass>
+ <commandLineArguments>
+ <commandLineArgument>start</commandLineArgument>
+ </commandLineArguments>
+ <platforms>
+<!--
+=======================================================================
+
+JSW relies on software licensed under the following "Tanuki Software License"
+
+BEGIN Tanuki Software License =========================================
+ Copyright (c) 1999, 2006 Tanuki Software, Inc.
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of the Java Service Wrapper and associated
+ documentation files (the "Software"), to deal in the Software
+ without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sub-license,
+ and/or sell copies of the Software, and to permit persons to
+ whom the Software is furnished to do so, subject to the
+ following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+
+ Portions of the Software have been derived from source code
+ developed by Silver Egg Technology under the following license:
+
+ BEGIN Silver Egg Techology License =================================
+
+ Copyright (c) 2001 Silver Egg Technology
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sub-license, and/or
+ sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+ END Silver Egg Techology License =====================================
+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>-Djava.system.class.loader=org.apache.james.container.spring.context.JamesClassLoader</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>
+
+ <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" />
+
+ <!-- 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" />
+
+ <!-- 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" />
+ <!-- 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>
+
+<!--
+The signing process excludes the artifact created by this plugin.
+The cause seems likely to be project type pom (not war).
+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/config/james</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/config/james</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>
+ <!- - override the destination directory for this resource - ->
+ <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>
+-->
+
+ <!-- be sure to start up james before run it -->
+ <!--
+ <plugin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-mpt-plugin</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <configuration>
+ <mailProtocolTests>
+ <mailProtocolTest>
+ <host>127.0.0.1</host>
+ <port>110</port>
+ <scriptFile>src/mpt/pop3.mpt</scriptFile>
+ <addUsers>
+ <addUser>
+ <host>127.0.0.1</host>
+ <port>4555</port>
+ <scriptFile>src/mpt/adduser.mpt</scriptFile>
+ <user>root</user>
+ <passwd>root</passwd>
+ </addUser>
+ </addUsers>
+ </mailProtocolTest>
+ <mailProtocolTest>
+ <host>127.0.0.1</host>
+ <port>143</port>
+ <scriptFile>src/mpt/imap.mpt</scriptFile>
+ <addUsers>
+ <addUser>
+ <host>127.0.0.1</host>
+ <port>4555</port>
+ <scriptFile>src/mpt/adduser.mpt</scriptFile>
+ <user>root</user>
+ <passwd>root</passwd>
+ </addUser>
+ </addUsers>
+ </mailProtocolTest>
+ <mailProtocolTest>
+ <host>127.0.0.1</host>
+ <port>25</port>
+ <scriptFile>src/mpt/smtp.mpt</scriptFile>
+ <addUsers>
+ <addUser>
+ <host>127.0.0.1</host>
+ <port>4555</port>
+ <scriptFile>src/mpt/adduser.mpt</scriptFile>
+ <user>root</user>
+ <passwd>root</passwd>
+ </addUser>
+ </addUsers>
+ </mailProtocolTest>
+ </mailProtocolTests>
+
+ </configuration>
+ </plugin>
+ -->
+
+ </plugins>
+
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+<!--
+James server 3.0-beta3 parent pom uses project.version directly
+in dependency management. So need to override that here for
+all server jars.
+-->
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-cli</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-container-spring</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-queue-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-queue-jms</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-queue-activemq</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-filesystem-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-dnsservice-library</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-dnsservice-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-dnsservice-dnsjava</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-protocols-library</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-protocols-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailetcontainer-camel</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailbox-adapter</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-jpa</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-file</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-jdbc</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-jcr</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-data-library</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-ldap</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-lmtpserver</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-smtpserver</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imapserver</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-pop3server</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-fetchmail</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailets</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-lifecycle-spring</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-hbase</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-container-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-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-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </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-ldap</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-smtpserver</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imapserver</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-lmtpserver</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-pop3server</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-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>
+ <artifactId>jackrabbit-core</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </exclusion>
+ </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-file</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-jpa</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-jdbc</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-hbase</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-jcr</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-processor</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+
+ </dependencies>
+</project>
Copied: james/app/trunk/src/assemble/app.xml (from r1162482, james/app/branches/3_0_beta3/src/assemble/app.xml)
URL: http://svn.apache.org/viewvc/james/app/trunk/src/assemble/app.xml?p2=james/app/trunk/src/assemble/app.xml&p1=james/app/branches/3_0_beta3/src/assemble/app.xml&r1=1162482&r2=1162525&rev=1162525&view=diff
==============================================================================
--- james/app/branches/3_0_beta3/src/assemble/app.xml (original)
+++ james/app/trunk/src/assemble/app.xml Sun Aug 28 14:02:27 2011
@@ -28,6 +28,7 @@
<!-- include txt files -->
<fileSet>
<directory>.</directory>
+ <directoryMode>0755</directoryMode>
<outputDirectory>/</outputDirectory>
<includes>
<include>README*</include>
@@ -36,6 +37,7 @@
<!-- include configs -->
<fileSet>
<directory>src/main/config/james</directory>
+ <directoryMode>0755</directoryMode>
<outputDirectory>conf</outputDirectory>
<!-- set some sane security defaults for config files -->
<fileMode>0600</fileMode>
@@ -44,6 +46,7 @@
<!-- create empty folders by copy a .dummy file -->
<fileSet>
<directory>.</directory>
+ <directoryMode>0755</directoryMode>
<outputDirectory>log</outputDirectory>
<includes>
<include>.dummy</include>
@@ -52,17 +55,21 @@
<fileSet>
<directory>src/main/app/var</directory>
<outputDirectory>var</outputDirectory>
+ <directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
<directory>src/main/app/lib</directory>
<outputDirectory>lib</outputDirectory>
+ <directoryMode>0755</directoryMode>
</fileSet>
<!-- include stuff from appassembler -->
<fileSet>
<directory>target/appassembler/lib</directory>
<outputDirectory>lib</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0600</fileMode>
<includes>
<include>*.jar</include>
</includes>
@@ -70,7 +77,8 @@
<fileSet>
<directory>target/appassembler/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
<includes>
<include>*.bat</include>
@@ -79,7 +87,8 @@
<fileSet>
<directory>target/appassembler/bin</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
<includes>
<include>*.sh</include>
@@ -89,7 +98,8 @@
<fileSet>
<directory>src/main/app/bin/</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
<includes>
<include>*.bat</include>
@@ -98,7 +108,8 @@
<fileSet>
<directory>src/main/app/bin/</directory>
<outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
<includes>
<include>setenv.sh</include>
@@ -109,16 +120,20 @@
<fileSet>
<directory>target/appassembler/jsw/james/lib</directory>
<outputDirectory>lib</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>target/appassembler/jsw/james/conf</directory>
<outputDirectory>conf</outputDirectory>
+ <directoryMode>0755</directoryMode>
<!-- set some sane security defaults for config files -->
<fileMode>0600</fileMode>
</fileSet>
<fileSet>
<directory>target/appassembler/jsw/james/bin</directory>
<outputDirectory>bin</outputDirectory>
+ <directoryMode>0755</directoryMode>
<fileMode>0755</fileMode>
<includes>
<include>*.bat</include>
@@ -128,6 +143,7 @@
<fileSet>
<directory>target/appassembler/jsw/james/bin</directory>
<outputDirectory>bin</outputDirectory>
+ <directoryMode>0755</directoryMode>
<fileMode>0755</fileMode>
</fileSet>
</fileSets>
@@ -135,12 +151,14 @@
<file>
<source>src/main/licensing/app/notice-for-binary.txt</source>
<outputDirectory>/</outputDirectory>
+ <fileMode>0644</fileMode>
<destName>NOTICE</destName>
<lineEnding>crlf</lineEnding>
</file>
<file>
<source>src/main/licensing/app/license-for-binary.txt</source>
<outputDirectory>/</outputDirectory>
+ <fileMode>0644</fileMode>
<destName>LICENSE</destName>
<lineEnding>crlf</lineEnding>
</file>
Modified: james/app/trunk/src/mpt/adduser.mpt
URL: http://svn.apache.org/viewvc/james/app/trunk/src/mpt/adduser.mpt?rev=1162525&r1=1162524&r2=1162525&view=diff
==============================================================================
--- james/app/trunk/src/mpt/adduser.mpt (original)
+++ james/app/trunk/src/mpt/adduser.mpt Sun Aug 28 14:02:27 2011
@@ -1,3 +1,22 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one #
+# or more contributor license agreements. See the NOTICE file #
+# distributed with this work for additional information #
+# regarding copyright ownership. The ASF licenses this file #
+# to you 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. #
+################################################################
+
S: JAMES Remote Administration Tool.*
S: Please enter your login and password
S: Login id:
@@ -16,4 +35,4 @@ S: User john.smith a.*
C: removemapping support@example.org john.smith@localhost
S: .*
C: addmapping support@example.org john.smith@localhost
-S: Adding mapping successful: true
\ No newline at end of file
+S: Adding mapping successful: true
Modified: james/app/trunk/src/mpt/john.smith.sieve
URL: http://svn.apache.org/viewvc/james/app/trunk/src/mpt/john.smith.sieve?rev=1162525&r1=1162524&r2=1162525&view=diff
==============================================================================
--- james/app/trunk/src/mpt/john.smith.sieve (original)
+++ james/app/trunk/src/mpt/john.smith.sieve Sun Aug 28 14:02:27 2011
@@ -1,6 +1,25 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one #
+# or more contributor license agreements. See the NOTICE file #
+# distributed with this work for additional information #
+# regarding copyright ownership. The ASF licenses this file #
+# to you 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. #
+################################################################
+
require ["fileinto"];
if header :is "Subject" "Hello"
{
fileinto "sub";
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org