Author: norman
Date: Tue Dec 14 06:43:21 2010
New Revision: 1048952
URL: http://svn.apache.org/viewvc?rev=1048952&view=rev
Log:
update spring xmls for osgi. See JAMES-910
Modified:
james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-context.xml
james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml
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=1048952&r1=1048951&r2=1048952&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
Tue Dec 14 06:43:21 2010
@@ -18,25 +18,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-2.5.xsd";>
-
- <bean
class="org.apache.james.container.spring.lifecycle.CommonsConfigurableBeanPostProcessor">
- <property name="configurationRegistry" ref="configurationRegistry" />
- <property name="order" value="1" />
- </bean>
-
- <bean id="configurationRegistry"
class="org.apache.james.container.spring.lifecycle.OsgiSpringConfigurationRegistry"/>
-
- <bean
class="org.apache.james.container.spring.lifecycle.LogEnabledBeanPostProcessor">
- <property name="logRegistry" ref="logRegistry" />
- <property name="order" value="0" />
- </bean>
-
- <bean id="logRegistry"
class="org.apache.james.container.spring.lifecycle.OsgiSpringLogRegistry"/>
-
- <bean class=
"org.springframework.context.annotation.CommonAnnotationBeanPostProcessor">
- <property name="order" value="3" />
- </bean>
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
+
<bean id="dnsservice"
class="org.apache.james.dnsservice.dnsjava.DNSJavaService" />
Modified:
james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml?rev=1048952&r1=1048951&r2=1048952&view=diff
==============================================================================
---
james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml
(original)
+++
james/server/trunk/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml
Tue Dec 14 06:43:21 2010
@@ -2,14 +2,18 @@
<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: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.xsd
+ 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.xsd";>
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<!-- export the dnsserver as osgi service -->
- <service id="dnsservice" ref="dnsservice"
- interface="org.apache.james.dnsservice.api.DNSService" />
-
+ <osgi:service ref="dnsservice">
+ <osgi:interfaces>
+ <beans:value>org.apache.james.dnsservice.api.DNSService</beans:value>
+
<beans:value>org.apache.james.dnsservice.api.DNSServiceMBean</beans:value>
+ </osgi:interfaces>
+ </osgi:service>
</beans:beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
