Author: norman
Date: Sat Jul 2 18:20:31 2011
New Revision: 1142255
URL: http://svn.apache.org/viewvc?rev=1142255&view=rev
Log:
Fix osgi services for data-library module. See JAMES-835
Added:
james/server/trunk/data-library/src/main/resources/META-INF/
- copied from r1141183,
james/server/trunk/file/src/main/resources/META-INF/
james/server/trunk/data-library/src/main/resources/META-INF/spring/data-context.xml
- copied, changed from r1141183,
james/server/trunk/file/src/main/resources/META-INF/spring/domainlist-context.xml
james/server/trunk/data-library/src/main/resources/META-INF/spring/data-osgi.xml
- copied, changed from r1141183,
james/server/trunk/file/src/main/resources/META-INF/spring/domainlist-osgi.xml
Removed:
james/server/trunk/data-library/src/main/resources/META-INF/spring/domainlist-context.xml
james/server/trunk/data-library/src/main/resources/META-INF/spring/domainlist-osgi.xml
james/server/trunk/file/src/main/resources/META-INF/
Modified:
james/server/trunk/data-library/pom.xml
james/server/trunk/file/pom.xml
Modified: james/server/trunk/data-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-library/pom.xml?rev=1142255&r1=1142254&r2=1142255&view=diff
==============================================================================
--- james/server/trunk/data-library/pom.xml (original)
+++ james/server/trunk/data-library/pom.xml Sat Jul 2 18:20:31 2011
@@ -27,6 +27,15 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-data-library</artifactId>
<name>Apache James Server Data Library</name>
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*,
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
Copied:
james/server/trunk/data-library/src/main/resources/META-INF/spring/data-context.xml
(from r1141183,
james/server/trunk/file/src/main/resources/META-INF/spring/domainlist-context.xml)
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/resources/META-INF/spring/data-context.xml?p2=james/server/trunk/data-library/src/main/resources/META-INF/spring/data-context.xml&p1=james/server/trunk/file/src/main/resources/META-INF/spring/domainlist-context.xml&r1=1141183&r2=1142255&rev=1142255&view=diff
==============================================================================
---
james/server/trunk/file/src/main/resources/META-INF/spring/domainlist-context.xml
(original)
+++
james/server/trunk/data-library/src/main/resources/META-INF/spring/data-context.xml
Sat Jul 2 18:20:31 2011
@@ -21,7 +21,8 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
- <bean id="domainlist"
class="org.apache.james.domainlist.xml.XMLDomainList" />
<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" />
</beans>
Copied:
james/server/trunk/data-library/src/main/resources/META-INF/spring/data-osgi.xml
(from r1141183,
james/server/trunk/file/src/main/resources/META-INF/spring/domainlist-osgi.xml)
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/resources/META-INF/spring/data-osgi.xml?p2=james/server/trunk/data-library/src/main/resources/META-INF/spring/data-osgi.xml&p1=james/server/trunk/file/src/main/resources/META-INF/spring/domainlist-osgi.xml&r1=1141183&r2=1142255&rev=1142255&view=diff
==============================================================================
---
james/server/trunk/file/src/main/resources/META-INF/spring/domainlist-osgi.xml
(original)
+++
james/server/trunk/data-library/src/main/resources/META-INF/spring/data-osgi.xml
Sat Jul 2 18:20:31 2011
@@ -8,16 +8,21 @@
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";>
-
- <!-- export the dnsserver as osgi service -->
- <osgi:service ref="domainlist">
+
+ <osgi:service ref="domainlistmanagement">
<osgi:interfaces>
- <beans:value>org.apache.james.domainlist.api.DomainList</beans:value>
+
<beans:value>org.apache.james.domainlist.api.DomainListManagementMBean</beans:value>
</osgi:interfaces>
</osgi:service>
- <osgi:service ref="domainlistmanagement">
+
+ <osgi:service ref="recipientrewritetablemanagement">
<osgi:interfaces>
-
<beans:value>org.apache.james.domainlist.api.DomainListManagementMBean</beans:value>
+
<beans:value>org.apache.james.rrt.api.RecipientRewriteTableManagementMBean</beans:value>
+ </osgi:interfaces>
+ </osgi:service>
+ <osgi:service ref="usersrepositorymanagement">
+ <osgi:interfaces>
+
<beans:value>org.apache.james.user.api.UsersRepositoryManagementMBean</beans:value>
</osgi:interfaces>
- </osgi:service>
+ </osgi:service>
</beans:beans>
Modified: james/server/trunk/file/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/file/pom.xml?rev=1142255&r1=1142254&r2=1142255&view=diff
==============================================================================
--- james/server/trunk/file/pom.xml (original)
+++ james/server/trunk/file/pom.xml Sat Jul 2 18:20:31 2011
@@ -27,7 +27,15 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-file</artifactId>
<name>Apache James Server File Data Persistence</name>
-
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*,
+ </james.osgi.export>
+ <james.osgi.import>
+ *
+ </james.osgi.import>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
