();
+ while (msgList.size() < batchSize) {
+ MimeMessage msg = createSimpleMessage("bla");
+ msgList.add(msg);
+ }
+ Message[] msgs = msgList.toArray(new Message[]{});
+ inbox.appendMessages(msgs);
+ }
+
+ disconnectImapStore();
+ }
+}
Index: container/spring-integration-tests/src/test/java/org/apache/james/container/spring/IMAPServerTestForked.java
===================================================================
--- container/spring-integration-tests/src/test/java/org/apache/james/container/spring/IMAPServerTestForked.java (Revision 0)
+++ container/spring-integration-tests/src/test/java/org/apache/james/container/spring/IMAPServerTestForked.java (Revision 5834)
@@ -0,0 +1,493 @@
+/****************************************************************
+ * 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. *
+ ****************************************************************/
+package org.apache.james.container.spring;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.security.spec.InvalidKeySpecException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.X509ExtendedTrustManager;
+import org.apache.commons.exec.LogOutputStream;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.net.PrintCommandListener;
+import org.apache.commons.net.SocketClient;
+import org.apache.commons.net.imap.AuthenticatingIMAPClient;
+import org.apache.commons.net.imap.IMAPReply;
+import org.apache.log4j.Logger;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ *
+ * @author MaSt
+ */
+public class IMAPServerTestForked extends MailServerTestBase {
+
+ private static final Logger log = Logger.getLogger(IMAPServerTestForked.class.getName());
+
+ public static final long MESSAGE_CREATION_PHASE_DURATION_MILLIS = 12 * 1000L;
+ private static final String msgData = "Subject: some subject\r\n\r\nthe body...";
+ private CommonsIMAPClient commonsImapClient;
+ private String greeting = null;
+ protected Pattern existsPattern = Pattern.compile("^\\*\\s+([0-9]+)\\s+EXISTS$", Pattern.CASE_INSENSITIVE);
+ protected AtomicInteger tagId = new AtomicInteger(0);
+
+ public IMAPServerTestForked() {
+ }
+
+ public void connectCommonsImapSSLClient() throws IOException {
+ connectCommonsImapClient(IMAPS_ADDRESS, true);
+ }
+
+ public void connectCommonsImapClient(InetSocketAddress address, boolean isSSL) throws IOException {
+ commonsImapClient = new CommonsIMAPClient(isSSL);
+ if (log.isTraceEnabled()) {
+ commonsImapClient.addProtocolCommandListener(new PrintCommandListener(new PrintStream(new LogOutputStream() {
+ @Override
+ protected void processLine(String line, int level) {
+ log.trace(line);
+ }
+ })));
+ }
+ commonsImapClient.setTrustManager(new X509ExtendedTrustManager() {
+
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String authType, Socket socket) throws CertificateException {
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String authType, Socket socket) throws CertificateException {
+ }
+
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String authType, SSLEngine engine) throws CertificateException {
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String authType, SSLEngine engine) throws CertificateException {
+ }
+
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ }
+
+ @Override
+ public X509Certificate[] getAcceptedIssuers() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+ });
+ log.debug("connecting to: " + address + " (isSSL=" + isSSL + ")");
+ commonsImapClient.connect(address.getAddress().getHostAddress(), address.getPort());
+ greeting = commonsImapClient.getReplyString();
+ assertTrue(commonsImapClient.capability());
+ assertEquals(IMAPReply.OK, getReplyCode());
+ try {
+ assertTrue(commonsImapClient.auth(AuthenticatingIMAPClient.AUTH_METHOD.PLAIN,
+ TEST_LOGIN_NAME_1, TEST_LOGIN_PASSWORD_1));
+ } catch (InvalidKeySpecException ex) {
+ throw new IOException(ex);
+ } catch (IOException ex) {
+ throw new IOException(ex);
+ } catch (NoSuchAlgorithmException ex) {
+ throw new IOException(ex);
+ } catch (InvalidKeyException ex) {
+ throw new IOException(ex);
+ }
+ assertEquals(IMAPReply.OK, getReplyCode());
+ assertTrue(commonsImapClient.noop());
+ assertEquals(IMAPReply.OK, getReplyCode());
+ }
+
+ protected int getReplyCode() {
+ try {
+ return IMAPReply.getReplyCode(commonsImapClient.getReplyStrings()[commonsImapClient.getReplyStrings().length - 1]);
+ } catch (IOException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ @Test
+ public void testLifecycle() throws IOException {
+ log.debug("testLifecycle()");
+ connectCommonsImapSSLClient();
+
+ assertTrue(commonsImapClient.noop());
+ assertEquals(IMAPReply.OK, getReplyCode());
+
+ assertTrue(commonsImapClient.capability());
+ assertEquals(IMAPReply.OK, getReplyCode());
+
+ connectCommonsImapSSLClient();
+ }
+
+ @Test
+ public void testGreeting() throws IOException {
+ log.debug("testGreeting()");
+ connectCommonsImapSSLClient();
+
+ assertTrue(greeting.startsWith("* OK brandedServerName IMAP4rev1 Server"));
+ assertFalse(greeting.toLowerCase().contains("james"));
+
+ connectCommonsImapSSLClient();
+ }
+
+ @Test
+ public void testLogin() throws IOException {
+ log.debug("testLogin()");
+ connectCommonsImapSSLClient();
+
+ commonsImapClient.disconnect();
+ }
+
+ @Test
+ public void testMore() throws IOException {
+ log.debug("testMore()");
+ connectCommonsImapSSLClient();
+
+ assertTrue(commonsImapClient.select("INBOX"));
+ assertEquals(IMAPReply.OK, getReplyCode());
+
+ commonsImapClient.disconnect();
+ }
+
+ /**
+ * Stable with Netty 3.3.1 and 3.8.1.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testAppendMessages() throws IOException {
+ log.debug("testAppendMessage()");
+ connectCommonsImapSSLClient();
+
+ assertTrue(commonsImapClient.select("INBOX"));
+ assertEquals(IMAPReply.OK, getReplyCode());
+
+ long startTime = System.currentTimeMillis();
+ long endTime = startTime + MESSAGE_CREATION_PHASE_DURATION_MILLIS;
+ long msgCount = 0;
+ do {
+ String msg = createMessage();
+ assertTrue(commonsImapClient.append("Inbox () {" + msg.length() + "+}\r\n" + msg));
+ assertEquals(IMAPReply.OK, getReplyCode());
+ msgCount++;
+ } while (System.currentTimeMillis() < endTime);
+
+ long duration = System.currentTimeMillis() - startTime;
+ log.info(String.format("%d messsages appended to INBOX using 1 thread, %.1f msgs per second",
+ msgCount, 1000.0 * msgCount / (duration > 0.0 ? duration : -1.)));
+
+ commonsImapClient.disconnect();
+ }
+
+ /**
+ * Very often fails with Netty 3.3.1. Stable with Netty 3.8.1.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testAppendMessagesAndFetchFlags() throws IOException {
+ log.debug("testAppendMessagesAndFetchFlags()");
+ connectCommonsImapSSLClient();
+
+ assertTrue(commonsImapClient.select("INBOX"));
+ assertEquals(IMAPReply.OK, getReplyCode());
+
+ long startTime = System.currentTimeMillis();
+ long endTime = startTime + MESSAGE_CREATION_PHASE_DURATION_MILLIS;
+ long msgCount = 0;
+ do {
+ String msg = createMessage();
+ assertTrue(commonsImapClient.append("Inbox () {" + msg.length() + "+}\r\n" + msg));
+ assertEquals(IMAPReply.OK, getReplyCode());
+ msgCount++;
+
+ assertTrue(commonsImapClient.select("Inbox"));
+ int nExists = getExists();
+ assertTrue(msgCount <= nExists);
+
+ for (int i = 1; i <= nExists; i++) {
+ assertTrue(commonsImapClient.fetch(Integer.toString(i), "FLAGS"));
+ assertEquals(IMAPReply.OK, getReplyCode());
+ }
+ } while (System.currentTimeMillis() < endTime);
+
+ long duration = System.currentTimeMillis() - startTime;
+ log.info(String.format("%d messsages appended to INBOX using 1 thread, %.1f msgs per second",
+ msgCount, 1000.0 * msgCount / (duration > 0.0 ? duration : -1.)));
+
+ commonsImapClient.disconnect();
+ }
+
+ protected int getExists() {
+ for (String s : commonsImapClient.getReplyStrings()) {
+ Matcher m = existsPattern.matcher(s);
+ if (m.find()) {
+ return Integer.parseInt(m.group(1));
+ }
+ }
+ throw new RuntimeException("no EXISTS line found");
+ }
+
+ /**
+ * Very often fails with Netty 3.3.1. Stable with Netty 3.8.1.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testFetchFlagsStress() throws IOException {
+ log.debug("testFetchFlagsStress()");
+ connectCommonsImapSSLClient();
+
+ assertTrue(commonsImapClient.select("INBOX"));
+ assertEquals(IMAPReply.OK, getReplyCode());
+
+ String msg = createMessage();
+ assertTrue(commonsImapClient.append("Inbox () {" + msg.length() + "+}\r\n" + msg));
+ assertEquals(IMAPReply.OK, getReplyCode());
+
+ long flagFetchCount = 0;
+ long startTime = System.currentTimeMillis();
+ long endTime = startTime + MESSAGE_CREATION_PHASE_DURATION_MILLIS;
+ do {
+ assertTrue(commonsImapClient.fetch("1", "FLAGS"));
+ assertEquals(IMAPReply.OK, getReplyCode());
+ flagFetchCount++;
+ } while (System.currentTimeMillis() < endTime);
+
+ long duration = System.currentTimeMillis() - startTime;
+ log.info(String.format("%d flags fetched from INBOX using 1 thread, %.1f fetches per second",
+ flagFetchCount, 1000.0 * flagFetchCount / (duration > 0.0 ? duration : -1.)));
+
+ commonsImapClient.disconnect();
+ }
+
+ @Test
+ public void testAppendMessageAndReconnect() throws IOException {
+ log.debug("testAppendMessageAndReconnect()");
+ connectCommonsImapSSLClient();
+
+ assertTrue(commonsImapClient.select("INBOX"));
+ assertEquals(IMAPReply.OK, getReplyCode());
+
+ long startTime = System.currentTimeMillis();
+ long endTime = startTime + MESSAGE_CREATION_PHASE_DURATION_MILLIS;
+ long msgCount = 0;
+ do {
+
+ String msg = createMessage();
+ assertTrue(commonsImapClient.append("Inbox () {" + msg.length() + "+}\r\n" + msg));
+ assertEquals(IMAPReply.OK, getReplyCode());
+ msgCount++;
+
+ if (r.nextBoolean()) {
+ if (r.nextBoolean()) {
+ assertEquals(IMAPReply.OK, commonsImapClient.sendCommand("UNSELECT"));
+ }
+ assertTrue(commonsImapClient.logout());
+ assertEquals(IMAPReply.OK, getReplyCode());
+ commonsImapClient.disconnect();
+ connectCommonsImapSSLClient();
+ assertTrue(commonsImapClient.select("INBOX"));
+ assertEquals(IMAPReply.OK, getReplyCode());
+ }
+ } while (System.currentTimeMillis() < endTime);
+
+ long duration = System.currentTimeMillis() - startTime;
+ log.info(String.format("%d messsages appended to INBOX using 1 thread, %.1f msgs per second",
+ msgCount, 1000.0 * msgCount / (duration > 0.0 ? duration : -1.)));
+
+ commonsImapClient.disconnect();
+ }
+
+ /**
+ * triggers a bug in netty 3.4.0.Alpha1 ... 3.8.1.
+ * @throws IOException
+ * @throws InterruptedException
+ */
+ @Test
+ public void testAppendMessagePartByPartReducedSize() throws IOException, InterruptedException {
+ log.debug("testAppendMessagePartByPartReducedSize()");
+ connectCommonsImapSSLClient();
+
+ assertTrue(commonsImapClient.select("INBOX"));
+ assertEquals(IMAPReply.OK, getReplyCode());
+
+ long startTime = System.currentTimeMillis();
+ long endTime = startTime + MESSAGE_CREATION_PHASE_DURATION_MILLIS;
+ long msgCount = 0;
+ int chunksize = 256;
+ do {
+ log.trace("chunksize = " + chunksize);
+
+ String msg = createMessage();
+ String tag = "B" + tagId.getAndIncrement();
+ String cmd = tag + " APPEND Inbox () {" + msg.length() + "+}" + SocketClient.NETASCII_EOL;
+
+ byte[] allData = (cmd + msg + SocketClient.NETASCII_EOL).getBytes();
+ log.trace("all data size = " + allData.length);
+ int offset = 0;
+ while (offset < allData.length) {
+ int _chunksize = chunksize;
+ if (offset + _chunksize > allData.length) {
+ _chunksize = allData.length - offset;
+ }
+ log.trace("offset = " + offset);
+ log.trace("_chunksize = " + _chunksize);
+ commonsImapClient.getOutputStream().write(allData, offset, _chunksize);
+ commonsImapClient.getOutputStream().flush();
+ offset += _chunksize;
+ }
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(commonsImapClient.getInputStream()));
+ String line;
+ do {
+ line = br.readLine();
+ log.trace(line);
+ } while (!line.startsWith(tag + " OK "));
+ // B8 OK [APPENDUID 710005855 9] APPEND completed.
+ Matcher m = Pattern.compile("^"+tag+" OK \\[APPENDUID \\d+ (\\d+)\\] APPEND completed\\.$").matcher(line);
+ assertTrue(m.find());
+ String msgId = m.group(1);
+
+ msgCount++;
+
+ tag = "B" + tagId.getAndIncrement();
+ allData = (tag + " FETCH "+msgId+" body[]" + SocketClient.NETASCII_EOL).getBytes();
+ commonsImapClient.getOutputStream().write(allData);
+ commonsImapClient.getOutputStream().flush();
+ // * 1 FETCH (BODY[] {388}
+ String regex = "^\\* "+msgId+" FETCH .* \\{(\\d+)\\}$";
+ log.debug(regex);
+ Pattern p = Pattern.compile(regex);
+ do {
+ line = br.readLine();
+ log.trace(line);
+ m = p.matcher(line);
+ } while (!m.find());
+ int size = Integer.parseInt(m.group(1));
+ byte[] data = new byte[size];
+ IOUtils.read(commonsImapClient.getInputStream(), data, 0, size);
+ assertEquals(msg, new String(data));
+ do {
+ line = br.readLine();
+ log.trace(line);
+ } while (!line.startsWith(tag + " OK "));
+
+ chunksize /= 2;
+ if (chunksize < 10) {
+ chunksize = 10;
+ }
+ } while (System.currentTimeMillis() < endTime);
+
+ long duration = System.currentTimeMillis() - startTime;
+ log.info(String.format("%d messsages appended to INBOX using 1 thread, %.1f msgs per second",
+ msgCount, 1000.0 * msgCount / (duration > 0.0 ? duration : -1.)));
+
+ commonsImapClient.disconnect();
+ }
+
+ @Test
+ public void testAppendMessagePartByPart() throws IOException, InterruptedException {
+ log.debug("testAppendMessagePartByPart()");
+ connectCommonsImapSSLClient();
+
+ assertTrue(commonsImapClient.select("INBOX"));
+ assertEquals(IMAPReply.OK, getReplyCode());
+
+ long startTime = System.currentTimeMillis();
+ long endTime = startTime + MESSAGE_CREATION_PHASE_DURATION_MILLIS;
+ long msgCount = 0;
+ do {
+ String msg = createMessage();
+ String tag = "B" + tagId.getAndIncrement();
+ String cmd = tag + " APPEND Inbox () {" + msg.length() + "+}";
+
+ commonsImapClient.getOutputStream().write((cmd + commonsImapClient.NETASCII_EOL).getBytes());
+ commonsImapClient.getOutputStream().flush();
+ commonsImapClient.getOutputStream().write((msg + commonsImapClient.NETASCII_EOL).getBytes());
+ commonsImapClient.getOutputStream().flush();
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(commonsImapClient.getInputStream()));
+ String line;
+ do {
+ line = br.readLine();
+ log.trace(line);
+ } while (!line.startsWith(tag + " OK "));
+ msgCount++;
+ } while (System.currentTimeMillis() < endTime);
+
+ long duration = System.currentTimeMillis() - startTime;
+ log.info(String.format("%d messsages appended to INBOX using 1 thread, %.1f msgs per second",
+ msgCount, 1000.0 * msgCount / (duration > 0.0 ? duration : -1.)));
+
+ commonsImapClient.disconnect();
+ }
+
+ protected String createMessage() {
+ /**
+ * A6 APPEND Inbox () {409+}
+ * To: me@localhost
+ * Message-ID: <2088679777.21.1398385696421.JavaMail.mark@i5>
+ * Subject: kQ23Wrqt.1398385695136.11
+ * MIME-Version: 1.0
+ * Content-Type: multipart/mixed;
+ * boundary="----=_Part_20_553291430.1398385696419"
+ *
+ * ------=_Part_20_553291430.1398385696419
+ * Content-Type: text/plain; charset=us-ascii
+ * Content-Transfer-Encoding: 7bit
+ *
+ * kQ23Wrqt.1398385695136.11
+ * ------=_Part_20_553291430.1398385696419--
+ *
+ */
+ StringBuilder sb = new StringBuilder(512);
+ sb.append("To: me@localhost\n"
+ + "Message-ID: <2088679777.21.1398385696421.JavaMail.mark@i5>\n"
+ + "Subject: kQ23Wrqt.1398385695136.11\n"
+ + "MIME-Version: 1.0\n"
+ + "Content-Type: multipart/mixed; \n"
+ + " boundary=\"----=_Part_20_553291430.1398385696419\"\n"
+ + "\n"
+ + "------=_Part_20_553291430.1398385696419\n"
+ + "Content-Type: text/plain; charset=us-ascii\n"
+ + "Content-Transfer-Encoding: 7bit\n"
+ + "\n")
+ .append("kQ23Wrqt.1398385695136.11kQ23Wrqt.1398385695136.11kQ23Wrqt.1398385695136.11".substring(r.nextInt(75)))
+ .append("\n"
+ + "------=_Part_20_553291430.1398385696419--\n");
+ return sb.toString();
+ }
+}
Index: container/spring-integration-tests/pom.xml
===================================================================
--- container/spring-integration-tests/pom.xml (Revision 0)
+++ container/spring-integration-tests/pom.xml (Revision 5834)
@@ -0,0 +1,499 @@
+
+
+
+
+
+ james-server
+ org.apache.james
+ 3.0.0-beta5-SNAPSHOT
+ ../../pom.xml
+
+
+ 4.0.0
+
+ org.apache.james
+ james-server-spring-integration-tests
+ bundle
+
+ Apache James :: Server :: Container Spring :: Integration Tests
+
+
+ 1025
+ 1143
+ 1465
+ 1993
+ 127.0.0.1
+ 9998
+
+ ${basedir}/target/var/mail
+
+ localhost
+ ${basedir}/target/test-classes/keystore
+
+
+
+
+
+ jenkins
+
+ ${env.ALLOCATED_SMTP_PORT}
+ ${env.ALLOCATED_IMAP_PORT}
+ ${env.ALLOCATED_SMTPS_PORT}
+ ${env.ALLOCATED_IMAPS_PORT}
+ ${env.ALLOCATED_JMX_PORT}
+
+
+
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+
+
+ maven-antrun-plugin
+ 1.7
+
+
+ process-test-resources
+
+
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+ ant-contrib
+ ant-contrib
+ 20020829
+
+
+
+
+ maven-surefire-plugin
+
+
+ test-forked
+ test
+
+ test
+
+
+
+ 1
+ false
+
+ **/*TestForked.java
+
+
+
+
+
+
+
+ smtp.port
+ ${smtp.port}
+
+
+ imap.port
+ ${imap.port}
+
+
+ smtps.port
+ ${smtps.port}
+
+
+ imaps.port
+ ${imaps.port}
+
+
+ jmx.port
+ ${jmx.port}
+
+
+ jmx.address
+ ${jmx.address}
+
+
+ mail.dir
+ ${mail.dir}
+
+
+ mail.domain
+ ${mail.domain}
+
+
+ keystore.location
+ ${keystore.location}
+
+
+ random
+
+
+
+
+
+
+
+
+ org.springframework
+ spring-core
+
+
+ org.springframework
+ spring-orm
+
+
+ org.springframework
+ spring-web
+
+
+ org.springframework
+ spring-webmvc
+ ${spring.version}
+
+
+ org.springframework
+ spring-test
+ ${spring.version}
+ test
+
+
+ org.springframework
+ spring-jdbc
+
+
+ org.springframework
+ spring-aop
+
+
+
+
+
+ org.aspectj
+ aspectjrt
+ 1.7.4
+
+
+ org.aspectj
+ aspectjweaver
+ 1.7.4
+
+
+ cglib
+ cglib
+ 3.1
+
+
+
+ org.hsqldb
+ hsqldb
+ 2.3.2
+ provided
+
+
+
+
+
+ org.apache.commons
+ commons-exec
+ 1.2
+ test
+
+
+
+ commons-dbcp
+ commons-dbcp
+
+
+ org.hibernate
+ hibernate-entitymanager
+ 4.3.1.Final
+
+
+ org.hibernate
+ hibernate-validator-annotation-processor
+ 4.3.1.Final
+
+
+
+
+
+ junit
+ junit
+ test
+
+
+ commons-codec
+ commons-codec
+ test
+
+
+ commons-io
+ commons-io
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ commons-lang
+ commons-lang
+
+
+ commons-collections
+ commons-collections
+ test
+
+
+ commons-cli
+ commons-cli
+ test
+
+
+
+ org.apache.james.protocols
+ protocols-smtp
+
+
+ org.apache.james
+ james-server-dnsservice-dnsjava
+
+
+ org.apache.james.protocols
+ protocols-smtp
+ ${protocols.version}
+ tests
+ test
+
+
+ org.apache.james.protocols
+ protocols-api
+ ${protocols.version}
+ tests
+ test
+
+
+ org.apache.james.protocols
+ protocols-netty
+
+
+ commons-net
+ commons-net
+ test
+
+
+ org.apache.james
+ apache-james-mailbox-spring
+
+
+ org.apache.james
+ apache-james-mailbox-jpa
+
+
+ org.apache.james
+ james-server-spring
+
+
+ org.apache.james
+ james-server-queue-activemq
+
+
+ org.apache.james
+ james-server-data-jpa
+
+
+ org.apache.james
+ james-server-data-file
+
+
+ org.apache.james
+ james-server-mailbox-adapter
+
+
+ org.apache.james
+ james-server-mailets
+
+
+ org.apache.james
+ james-server-fetchmail
+
+
+ org.apache.james
+ james-server-protocols-imap4
+
+
+ org.apache.james
+ james-server-protocols-smtp
+
+
+ org.apache.james
+ james-server-protocols-lmtp
+
+
+ org.apache.james
+ james-server-protocols-pop3
+
+
+ org.apache.james
+ james-server-mailetcontainer-camel
+
+
+ org.apache.camel
+ camel-spring
+ ${camel.version}
+
+
+ org.apache.xbean
+ xbean-spring
+ ${xbean-spring.version}
+
+
+
+
+
+
+ org.apache.james
+ apache-james-mailbox-spring
+ ${mailbox.version}
+
+
+ org.apache.james
+ apache-james-mailbox-openjpa
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: container/spring-integration-tests/README
===================================================================
--- container/spring-integration-tests/README (Revision 0)
+++ container/spring-integration-tests/README (Revision 5834)
@@ -0,0 +1,20 @@
+Spring-Xml-configured James/Hibernate integration example/test.
+
+This module represents a basic server setup, ie.
+
+ smtp for incoming deliveries
+ smtps for authenticated relaying
+ imaps for mailbox access
+
+ROADMAP
+=======
+
+* Extend James server to allow for descriptor-only server component configuration
+ via spring component scan (backends and protocols selected via dependency
+ definitions).
+* Configure server instances via annotations?
+* Use hibernate-search. OpenJPA and the explicit usage of lucene-search
+ may be the wrong way to go forward because there is obviously no interest in
+ upgrading OpenJPA to the JPA 2.1/JSR 338 standard (which brings with it such
+ essential and useful stuff as @Index and compile/type-safe queries in a
+ standardized manner).
\ No newline at end of file
Eigenschaftsänderungen: container/spring-integration-tests
___________________________________________________________________
Hinzugefügt: svn:ignore
+ target
Eigenschaftsänderungen: container/lifecycle-api
___________________________________________________________________
Hinzugefügt: svn:ignore
+ target
Eigenschaftsänderungen: container/cli
___________________________________________________________________
Hinzugefügt: svn:ignore
+ target
Eigenschaftsänderungen: container/core
___________________________________________________________________
Hinzugefügt: svn:ignore
+ target
Index: container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
===================================================================
--- container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java (Revision 5815)
+++ container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java (Revision 5834)
@@ -21,11 +21,10 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-
import javax.inject.Inject;
+import javax.inject.Named;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
-
import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
@@ -44,7 +43,7 @@
private Logger log;
@Inject
- public void setMailboxManager(MailboxManager mailboxManager) {
+ public void setMailboxManager(@Named("mailboxmanager") MailboxManager mailboxManager) {
this.mailboxManager = mailboxManager;
}
Eigenschaftsänderungen: container/mailbox-adapter
___________________________________________________________________
Hinzugefügt: svn:ignore
+ target
Eigenschaftsänderungen: dns-service/dnsservice-api
___________________________________________________________________
Hinzugefügt: svn:ignore
+ target
Eigenschaftsänderungen: dns-service/dnsservice-library
___________________________________________________________________
Hinzugefügt: svn:ignore
+ target
Eigenschaftsänderungen: dns-service/dnsservice-dnsjava
___________________________________________________________________
Hinzugefügt: svn:ignore
+ target
Index: karaf/build.sh
===================================================================
--- karaf/build.sh (Revision 5815)
+++ karaf/build.sh (Revision 5834)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-(cd features && mvn clean install)
-(cd integration && mvn clean install)
-(cd distribution && mvn clean install)
Index: karaf/pom.xml
===================================================================
--- karaf/pom.xml (Revision 0)
+++ karaf/pom.xml (Revision 5834)
@@ -0,0 +1,24 @@
+
+
+ 4.0.0
+
+
+ org.apache.james
+ james-server
+ 3.0.0-beta5-SNAPSHOT
+ ../pom.xml
+
+
+ org.apache.james.karaf
+ james-karaf
+ pom
+ Apache James :: Karaf
+
+
+ features
+ distribution
+ integration
+
+
Index: karaf/README.md
===================================================================
--- karaf/README.md (Revision 5815)
+++ karaf/README.md (Revision 5834)
@@ -35,8 +35,8 @@
Build and run
=============
-You can build the project by running the script provided in karaf folder:
- $ ./build.sh
+You can build the project by running in karaf folder:
+ $ mvn clean install
You can also build each project individually by running **$ mvn clean install** inside each maven project.
Index: karaf/features/pom.xml
===================================================================
--- karaf/features/pom.xml (Revision 5815)
+++ karaf/features/pom.xml (Revision 5834)
@@ -94,4 +94,4 @@