james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r1141824 - in /james/server/trunk: mailetcontainer-camel/ mailetcontainer-camel/src/main/resources/ mailetcontainer-camel/src/main/resources/META-INF/ mailetcontainer-camel/src/main/resources/META-INF/spring/ queue-activemq/src/main/resourc...
Date Fri, 01 Jul 2011 06:13:23 GMT
Author: norman
Date: Fri Jul  1 06:13:23 2011
New Revision: 1141824

URL: http://svn.apache.org/viewvc?rev=1141824&view=rev
Log:
Allow to enable/disable BlobMessage usage and add osgi meta-data to mailetcontainer-camel.
See JAMES-835

Added:
    james/server/trunk/mailetcontainer-camel/src/main/resources/
    james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/
    james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/
    james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
    james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-osgi.xml
Modified:
    james/server/trunk/mailetcontainer-camel/pom.xml
    james/server/trunk/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml

Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1141824&r1=1141823&r2=1141824&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Fri Jul  1 06:13:23 2011
@@ -23,6 +23,17 @@
     <groupId>org.apache.james</groupId>
     <version>3.0-beta2-SNAPSHOT</version>
   </parent>
+  <properties>
+      <!-- OSGI stuff -->
+    <james.osgi.export>
+      org.apache.james.mailetcontainer.impl.*,
+      org.apache.james.mailetcontainer.lib.*
+    </james.osgi.export>
+    <james.osgi.import>
+      *
+    </james.osgi.import>
+  </properties> 
+  
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
   <artifactId>james-server-mailetcontainer-camel</artifactId>

Added: james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml?rev=1141824&view=auto
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
(added)
+++ james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
Fri Jul  1 06:13:23 2011
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!--
+        ! 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. !
+    -->
+
+
+<beans xmlns="http://www.springframework.org/schema/beans" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+         
+    <!-- Import PostBeanProcessors -->
+    <import resource="classpath*:org/apache/james/container/spring/server-context.xml"/>
+    
+  
+   
+        
+    <!-- 
+      Mailet Container Beans.
+     -->
+    <bean id="mailprocessor" name="processorRoute" class="org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor"/>
+  
+    <!-- 
+      mailcontext bean must be defined after mailProcessor 
+      otherwise LogEnabled injection via LogEnabledBeanPostProcessor will not occur before

+      it is used - Seems like a Spring bug.
+    -->
+    <bean id="mailetcontext" class="org.apache.james.mailetcontainer.impl.JamesMailetContext"/>
+    <bean id="mailspooler" class="org.apache.james.mailetcontainer.impl.JamesMailSpooler"/>
+</beans>

Added: james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-osgi.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-osgi.xml?rev=1141824&view=auto
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-osgi.xml
(added)
+++ james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-osgi.xml
Fri Jul  1 06:13:23 2011
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<beans:beans                                                                         
  
+   xmlns="http://www.springframework.org/schema/osgi"                                   
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns:beans="http://www.springframework.org/schema/beans"             
+   xmlns:osgi="http://www.springframework.org/schema/osgi"                              
+   xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">            
      
+
+    <osgi:service ref="mailetcontext">
+      <osgi:interfaces>
+       <beans:value>org.apache.mailet.MailetContext</beans:value>
+      </osgi:interfaces>
+    </osgi:service>         
+   <osgi:service ref="mailspooler">
+      <osgi:interfaces>
+       <beans:value>org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean</beans:value>
+      </osgi:interfaces>
+    </osgi:service>
+   <osgi:service ref="mailprocessor">
+      <osgi:interfaces>
+       <beans:value>org.apache.james.mailetcontainer.api.MailProcessor</beans:value>
+      </osgi:interfaces>
+    </osgi:service>
+</beans:beans>

Modified: james/server/trunk/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml?rev=1141824&r1=1141823&r2=1141824&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
(original)
+++ james/server/trunk/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
Fri Jul  1 06:13:23 2011
@@ -33,7 +33,8 @@
    <osgix:cm-properties id="cmProps" persistent-id="org.apache.james">
       <prop key="amq.brokerURL">vm://james?create=false</prop>
       <prop key="amq.sessionCacheSize">10</prop>      
-      <prop key="amq.baseDir">/var/store/activemq/</prop>      
+      <prop key="amq.baseDir">/var/store/activemq/</prop>
+      <prop key="amq.useBlobMessages">true</prop>
    </osgix:cm-properties>
 
    <!-- placeholder configurer -->
@@ -48,7 +49,9 @@
     <!-- 
       James Mail Queue Factory
      -->
-    <bean id="mailqueuefactory" class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory"
depends-on="broker"/>
+    <bean id="mailqueuefactory" class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory"
depends-on="broker">
+        <property name="useBlobMessages" value="${amq.useBlobMessages}"/>
+    </bean>
 
     <!-- 
       ActiveMQ Broker, Connections, Blob



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


Mime
View raw message