Author: norman
Date: Mon Jul 4 05:52:46 2011
New Revision: 1142552
URL: http://svn.apache.org/viewvc?rev=1142552&view=rev
Log:
No need to import postbeanprocessors as this stuff will get done via our own
extender. See JAMES-835
Removed:
james/server/trunk/container-spring/src/main/resources/META-INF/spring/extender/
james/server/trunk/container-spring/src/main/resources/org/
Modified:
james/server/trunk/data-library/src/main/resources/META-INF/spring/data-context.xml
james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml
james/server/trunk/imapserver/src/main/resources/META-INF/spring/imapserver-context.xml
james/server/trunk/lmtpserver/src/main/resources/META-INF/spring/lmtpserver-context.xml
james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
james/server/trunk/pop3server/src/main/resources/META-INF/spring/pop3server-context.xml
james/server/trunk/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
james/server/trunk/smtpserver/src/main/resources/META-INF/spring/smtpserver-context.xml
Modified:
james/server/trunk/data-library/src/main/resources/META-INF/spring/data-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/resources/META-INF/spring/data-context.xml?rev=1142552&r1=1142551&r2=1142552&view=diff
==============================================================================
---
james/server/trunk/data-library/src/main/resources/META-INF/spring/data-context.xml
(original)
+++
james/server/trunk/data-library/src/main/resources/META-INF/spring/data-context.xml
Mon Jul 4 05:52:46 2011
@@ -19,10 +19,6 @@
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"/>
-
-
<bean id="domainlistmanagement"
class="org.apache.james.domainlist.lib.DomainListManagement" />
<bean id="recipientrewritetablemanagement"
class="org.apache.james.rrt.lib.RecipientRewriteTableManagement" />
<bean id="usersrepositorymanagement"
class="org.apache.james.user.lib.UsersRepositoryManagement" />
Modified:
james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml?rev=1142552&r1=1142551&r2=1142552&view=diff
==============================================================================
---
james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml
(original)
+++
james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml
Mon Jul 4 05:52:46 2011
@@ -17,13 +17,8 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:camel="http://camel.apache.org/schema/spring";
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"/>
- -->
<bean id="dnsservice"
class="org.apache.james.dnsservice.dnsjava.DNSJavaService" />
</beans>
Modified:
james/server/trunk/imapserver/src/main/resources/META-INF/spring/imapserver-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/resources/META-INF/spring/imapserver-context.xml?rev=1142552&r1=1142551&r2=1142552&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/resources/META-INF/spring/imapserver-context.xml
(original)
+++
james/server/trunk/imapserver/src/main/resources/META-INF/spring/imapserver-context.xml
Mon Jul 4 05:52:46 2011
@@ -24,9 +24,6 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd";>
- <!-- Import PostBeanProcessors -->
- <import
resource="classpath*:org/apache/james/container/spring/server-context.xml"/>
-
<!-- Configuration Admin entries so the user can overwrite them if needed
-->
<!-- This allows the user to switch also to the OIO based server -->
<osgix:cm-properties id="cmProps" persistent-id="org.apache.james">
Modified:
james/server/trunk/lmtpserver/src/main/resources/META-INF/spring/lmtpserver-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/resources/META-INF/spring/lmtpserver-context.xml?rev=1142552&r1=1142551&r2=1142552&view=diff
==============================================================================
---
james/server/trunk/lmtpserver/src/main/resources/META-INF/spring/lmtpserver-context.xml
(original)
+++
james/server/trunk/lmtpserver/src/main/resources/META-INF/spring/lmtpserver-context.xml
Mon Jul 4 05:52:46 2011
@@ -23,9 +23,6 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd";>
- <!-- Import PostBeanProcessors -->
- <import
resource="classpath*:org/apache/james/container/spring/server-context.xml"/>
-
<!-- Configuration Admin entries so the user can overwrite them if needed
-->
<!-- This allows the user to switch also to the OIO based server -->
<osgix:cm-properties id="cmProps" persistent-id="org.apache.james">
Modified:
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=1142552&r1=1142551&r2=1142552&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
(original)
+++
james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
Mon Jul 4 05:52:46 2011
@@ -18,13 +18,7 @@
<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.
-->
Modified:
james/server/trunk/pop3server/src/main/resources/META-INF/spring/pop3server-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/resources/META-INF/spring/pop3server-context.xml?rev=1142552&r1=1142551&r2=1142552&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/resources/META-INF/spring/pop3server-context.xml
(original)
+++
james/server/trunk/pop3server/src/main/resources/META-INF/spring/pop3server-context.xml
Mon Jul 4 05:52:46 2011
@@ -23,10 +23,7 @@
http://www.springframework.org/schema/osgi-compendium
http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd";>
-
- <!-- Import PostBeanProcessors -->
- <import
resource="classpath*:org/apache/james/container/spring/server-context.xml"/>
-
+
<!-- Configuration Admin entries so the user can overwrite them if needed
-->
<!-- This allows the user to switch also to the OIO based server -->
<osgix:cm-properties id="cmProps" persistent-id="org.apache.james">
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=1142552&r1=1142551&r2=1142552&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
Mon Jul 4 05:52:46 2011
@@ -25,10 +25,7 @@
http://www.springframework.org/schema/osgi-compendium
http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd";>
-
- <!-- Import PostBeanProcessors -->
- <import
resource="classpath*:org/apache/james/container/spring/server-context.xml"/>
-
+
<!-- Configuration Admin entries so the user can overwrite them if needed
-->
<osgix:cm-properties id="cmProps" persistent-id="org.apache.james">
<prop key="amq.brokerURL">vm://james?create=false</prop>
Modified:
james/server/trunk/smtpserver/src/main/resources/META-INF/spring/smtpserver-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/resources/META-INF/spring/smtpserver-context.xml?rev=1142552&r1=1142551&r2=1142552&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/resources/META-INF/spring/smtpserver-context.xml
(original)
+++
james/server/trunk/smtpserver/src/main/resources/META-INF/spring/smtpserver-context.xml
Mon Jul 4 05:52:46 2011
@@ -23,9 +23,6 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd";>
- <!-- Import PostBeanProcessors -->
- <import
resource="classpath*:org/apache/james/container/spring/server-context.xml"/>
-
<!-- Configuration Admin entries so the user can overwrite them if needed
-->
<!-- This allows the user to switch also to the OIO based server -->
<osgix:cm-properties id="cmProps" persistent-id="org.apache.james">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
