Modified: james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/mailets/StandardRemoteDeliveryTestable.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/mailets/StandardRemoteDeliveryTestable.java?rev=998103&r1=998102&r2=998103&view=diff ============================================================================== --- james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/mailets/StandardRemoteDeliveryTestable.java (original) +++ james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/mailets/StandardRemoteDeliveryTestable.java Fri Sep 17 12:54:23 2010 @@ -30,7 +30,7 @@ import java.util.Properties; /** * RemoteDelivery extension to publish test-aware interfaces */ -public class StandardRemoteDeliveryTestable extends ActiveMQRemoteDelivery implements RemoteDeliveryTestable { +public class StandardRemoteDeliveryTestable extends RemoteDelivery implements RemoteDeliveryTestable { public boolean logEnabled = true; private Tester tester;
Modified: james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java?rev=998103&r1=998102&r2=998103&view=diff ============================================================================== --- james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java (original) +++ james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/RemoteDeliveryTestable.java Fri Sep 17 12:54:23 2010 @@ -21,7 +21,6 @@ package org.apache.james.transport.remot import javax.mail.MessagingException; -import org.apache.camel.CamelContextAware; import org.apache.james.api.dnsservice.DNSService; import org.apache.james.services.MailServer; import org.apache.mailet.Mail; @@ -33,7 +32,7 @@ import org.apache.mailet.MailetConfig; * <p>Each RemoteDelivery to be tested should be estended throuth this and * it should take the session from Tester.obtainSession(Properties)</p> */ -public interface RemoteDeliveryTestable extends CamelContextAware{ +public interface RemoteDeliveryTestable{ void setRemoteDeliveryTester(Tester tester); void setDNSService(DNSService dnsServer); Modified: james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java?rev=998103&r1=998102&r2=998103&view=diff ============================================================================== --- james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java (original) +++ james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java Fri Sep 17 12:54:23 2010 @@ -19,13 +19,11 @@ package org.apache.james.transport.remotedeliverytester; -import org.apache.camel.CamelContext; import org.apache.james.api.dnsservice.DNSService; import org.apache.james.api.dnsservice.TemporaryResolutionException; import org.apache.james.core.MailImpl; import org.apache.james.services.MailRepository; import org.apache.james.services.MailServer; -import org.apache.james.services.store.Store; import org.apache.mailet.HostAddress; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; @@ -130,10 +128,9 @@ public class Tester { Tester.instance = this; } - public void init(CamelContext context, Properties mailetConfigProperties) throws MessagingException { + public void init(Properties mailetConfigProperties) throws MessagingException { mailetConfig = new TesterMailetConfig(this, mailetConfigProperties); remoteDelivery.setDNSService(dnsServer); - remoteDelivery.setCamelContext(context); remoteDelivery.setMailServer(new MailServer() { public boolean supportVirtualHosting() { Modified: james/server/trunk/spring-deployment/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=998103&r1=998102&r2=998103&view=diff ============================================================================== --- james/server/trunk/spring-deployment/pom.xml (original) +++ james/server/trunk/spring-deployment/pom.xml Fri Sep 17 12:54:23 2010 @@ -368,13 +368,7 @@ <artifactId>camel-spring</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-camel</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> + <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-spring</artifactId> <scope>runtime</scope> Modified: james/server/trunk/spring-deployment/src/main/config/james/spoolmanager.xml URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spoolmanager.xml?rev=998103&r1=998102&r2=998103&view=diff ============================================================================== --- james/server/trunk/spring-deployment/src/main/config/james/spoolmanager.xml (original) +++ james/server/trunk/spring-deployment/src/main/config/james/spoolmanager.xml Fri Sep 17 12:54:23 2010 @@ -440,10 +440,8 @@ Regards, Postmaster XXX.YYY <!-- Attempt remote delivery using the specified repository for the spool, --> <!-- using delay time to retry delivery and the maximum number of retries --> - <mailet match="All" class="ActiveMQRemoteDelivery"> + <mailet match="All" class="RemoteDelivery"> <outgoingQueue> outgoing</outgoingQueue> - <outgoingRetryQueue> outgoing.retry</outgoingRetryQueue> - <!-- Delivery Schedule based upon RFC 2821, 4.5.4.1 --> <!-- 5 day retry period, with 4 attempts in the first Modified: james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=998103&r1=998102&r2=998103&view=diff ============================================================================== --- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml (original) +++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml Fri Sep 17 12:54:23 2010 @@ -78,7 +78,7 @@ <entry key="smtpProtocolHandlerChain" value="smtpserver"/> <entry key="pop3ProtocolHandlerChain" value="pop3server"/> <entry key="remoteProtocolHandlerChain" value="remotemanager"/> - <entry key="spool" value="spoolmanager"/> + <entry key="mailProcessor" value="spoolmanager"/> <entry key="mailserver" value="James"/> </map> </property> @@ -100,7 +100,7 @@ <entry key="smtpProtocolHandlerChain" value="smtpserver"/> <entry key="pop3ProtocolHandlerChain" value="pop3server"/> <entry key="remoteProtocolHandlerChain" value="remoteManager"/> - <entry key="spool" value="spoolmanager"/> + <entry key="mailProcessor" value="spoolmanager"/> <entry key="mailserver" value="James"/> <entry key="poster" value="James"/> </map> @@ -124,16 +124,7 @@ <camel:routeBuilder ref="processorRoute" /> </camel:camelContext> - - <bean id="pollingjms" class="org.apache.james.transport.camel.JMSSelectorPollingComponent"/> - - <!-- Build the camelroute from the spoolmanager.xml using ActiveMQ as producer and consumer--> - <bean id="spoolmanager" name="processorRoute" class="org.apache.james.transport.camel.ActiveMQProcessorRouteBuilder"> - <property name="maxConcurrentConsumers" value="500"/> - </bean> - - - + <!-- jms connection pooling --> <bean id="jmsConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" destroy-method="stop"> <property name="connectionFactory"> @@ -141,34 +132,31 @@ <property name="brokerURL" value="vm://localhost?broker.useJmx=false"/> </bean> </property> + <!-- + <property name="transactionManager" ref="jmsTransactionManager"/> + --> </bean> <!-- setup spring jms TX manager --> <bean id="jmsTransactionManager" class="org.springframework.jms.connection.JmsTransactionManager"> <property name="connectionFactory" ref="jmsConnectionFactory"/> </bean> - - <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent" depends-on="broker"> - <property name="connectionFactory" ref="jmsConnectionFactory"/> - <property name="transacted" value="true"/> - <property name="transactionManager" ref="jmsTransactionManager"/> - </bean> <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean"> <property name="config" value="file://conf/activemq.xml" /> <property name="start" value="true" /> </bean> - <bean id ="spoolMessageStore" class="org.apache.james.FileSpoolMessageStore"> - <property name="spoolDirectory" value="file://var/mail/spool"/> - </bean> - - <bean id ="mailClaimCheck" class="org.apache.james.transport.camel.MailClaimCheck"/> - <bean id ="mailEnricher" class="org.apache.james.transport.camel.MailEnricher"/> - + <bean id="mailQueueFactory" class="org.apache.james.queue.ActiveMQMailQueueFactory"/> + + <!-- Build the camelroute from the spoolmanager.xml + <bean id="mailProcessor" name="processorRoute" class="org.apache.james.transport.camel.CamelMailProcessorList"/> + <bean id="spoolmanager" class="org.apache.james.transport.JamesSpoolManager"/> + + <!-- mailserver implementation which use activemq for spooling the mail --> - <bean id="mailserver" name="James" class="org.apache.james.ActiveMQMailServer"/> + <bean id="mailserver" name="James" class="org.apache.james.JamesMailServer"/> <bean id="mailetcontext" class="org.apache.james.JamesMailetContext"/> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org