You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/12/14 11:23:52 UTC
svn commit: r1049023 - in /james/server/trunk: ./
dnsservice-dnsjava/src/main/resources/ osgi/ osgi/src/ osgi/src/main/
osgi/src/main/java/ osgi/src/main/java/org/ osgi/src/main/java/org/apache/
osgi/src/main/java/org/apache/james/ osgi/src/main/java/o...
Author: norman
Date: Tue Dec 14 10:23:51 2010
New Revision: 1049023
URL: http://svn.apache.org/viewvc?rev=1049023&view=rev
Log:
Add custom extender bundle which will take care of james lifecycle within OSGI. See JAMES-910
Added:
james/server/trunk/osgi/
james/server/trunk/osgi/LICENSE.txt
james/server/trunk/osgi/NOTICE.txt
james/server/trunk/osgi/pom.xml
james/server/trunk/osgi/src/
james/server/trunk/osgi/src/main/
james/server/trunk/osgi/src/main/java/
james/server/trunk/osgi/src/main/java/org/
james/server/trunk/osgi/src/main/java/org/apache/
james/server/trunk/osgi/src/main/java/org/apache/james/
james/server/trunk/osgi/src/main/java/org/apache/james/container/
james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/
james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java
james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java
james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java
james/server/trunk/osgi/src/main/resources/
james/server/trunk/osgi/src/main/resources/META-INF/
james/server/trunk/osgi/src/main/resources/META-INF/spring/
james/server/trunk/osgi/src/main/resources/META-INF/spring/extender/
james/server/trunk/osgi/src/main/resources/META-INF/spring/extender/osgi-extender.xml
Removed:
james/server/trunk/dnsservice-dnsjava/src/main/resources/dnsservice.xml
Modified:
james/server/trunk/pom.xml
Added: james/server/trunk/osgi/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/LICENSE.txt?rev=1049023&view=auto
==============================================================================
--- james/server/trunk/osgi/LICENSE.txt (added)
+++ james/server/trunk/osgi/LICENSE.txt Tue Dec 14 10:23:51 2010
@@ -0,0 +1,232 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+
+
+
+ THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
+ FOLLOWING LICENSES:
+
+
+
+ Concurrent, Public Domain
+ (see stage/concurrent/jars/concurrent.LICENSE)
+
+ BouncyCastle, MIT License
+ (see stage/org.bouncycastle/jars/BouncyCastle.LICENSE)
+ http://www.bouncycastle.org/licence.html
+
+ DnsJava, BSD License
+ (see stage/dnsjava/jars/dnsjava.LICENSE)
+ http://www.dnsjava.org/README
+
+ JavaBeans Activation Framework, CDDL License
+ http://glassfish.dev.java.net/public/CDDLv1.0.html
+
+ JavaMail, CDDL License
+ http://glassfish.dev.java.net/public/CDDLv1.0.html
+
+ QDox, ASL 1.1 License
+ (see phoenix-deployment/tools/lib/qdox.LICENSE)
+ http://qdox.codehaus.org/license.html
+
+ MX4J, ASL 1.1 License
+ (see phoenix-deployment/phoenix-bin/bin/lib/mx4j.LICENSE)
+
+ Spice, ASL 1.1 License
+ (see phoenix-deployment/phoenix-bin/bin/lib/spice.LICENSE)
+ http://spice.codehaus.org/license.html
+
+ Wrapper, MIT License
+ (see phoenix-deployment/phoenix-bin/bin/Wrapper.LICENSE)
+ http://wrapper.tanukisoftware.org/doc/english/license.html
+
+ ISO-Relax, MIT License
+ (see phoenix-deployment/phoenix-bin/tools/lib/isorelax.LICENSE)
+
+ MSV, BSD License
+ (see phoenix-deployment/phoenix-bin/tools/lib/msv.LICENSE)
+
+ RelaxNG-Datatype, BSD License
+ (see phoenix-deployment/phoenix-bin/tools/lib/relaxngDatatype.LICENSE)
+
+ XSDLib, BSD License
+ (see phoenix-deployment/phoenix-bin/tools/lib/xsdlib.LICENSE)
+
+ XStream, BSD License
+ (see stage/com.thoughtworks.xstream/jars/xstream.LICENSE)
+
\ No newline at end of file
Added: james/server/trunk/osgi/NOTICE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/NOTICE.txt?rev=1049023&view=auto
==============================================================================
--- james/server/trunk/osgi/NOTICE.txt (added)
+++ james/server/trunk/osgi/NOTICE.txt Tue Dec 14 10:23:51 2010
@@ -0,0 +1,11 @@
+
+=========================================================================
+== NOTICE file for use with the Apache License, Version 2.0, ==
+=========================================================================
+
+Apache JAMES
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
\ No newline at end of file
Added: james/server/trunk/osgi/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/pom.xml?rev=1049023&view=auto
==============================================================================
--- james/server/trunk/osgi/pom.xml (added)
+++ james/server/trunk/osgi/pom.xml Tue Dec 14 10:23:51 2010
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>3.0-M3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-osgi</artifactId>
+ <name>Apache James Server OSGI Bindings</name>
+ <properties>
+ <!-- OSGI stuff -->
+ <james.osgi.export>
+ org.apache.james.*
+ </james.osgi.export>
+ <!-- spring stuff is optional as we don't need it if no spring-dm is used with this bundle -->
+ <james.osgi.import>
+ org.springframework.context.annotation;version="[3.0,4)",
+ *
+ </james.osgi.import>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>zodiac-repository</id>
+ <name>Zodiac Milestone Repository</name>
+ <url>http://zodiac.springsource.com/maven/bundles/milestone</url>
+ </repository>
+ </repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Fragment-Host>org.springframework.osgi.extender</Fragment-Host>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-container-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Added: james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java?rev=1049023&view=auto
==============================================================================
--- james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java (added)
+++ james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java Tue Dec 14 10:23:51 2010
@@ -0,0 +1,84 @@
+/****************************************************************
+ * 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. *
+ ****************************************************************/
+package org.apache.james.container.osgi;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+import org.apache.james.container.spring.SpringInstanceFactory;
+import org.apache.james.container.spring.lifecycle.CommonsConfigurableBeanPostProcessor;
+import org.apache.james.container.spring.lifecycle.LogEnabledBeanPostProcessor;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.InvalidSyntaxException;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
+import org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor;
+
+/**
+ * {@link OsgiBeanFactoryPostProcessor} which add all life-cycle needed {@link BeanPostProcessor} to the {@link ConfigurableListableBeanFactory} on creation. This ensures that
+ * the right methods are called during startup when deploying James bundles.
+ *
+ * Beside this it also add support for JSR-250 annotations
+ *
+ *
+ */
+public class JamesOsgiBeanFactoryPostProcessor implements OsgiBeanFactoryPostProcessor{
+
+ private String confDir;
+ public void setConfigurationDirectory(String confDir) {
+ this.confDir = confDir;
+ }
+ /*
+ * (non-Javadoc)
+ * @see org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor#postProcessBeanFactory(org.osgi.framework.BundleContext, org.springframework.beans.factory.config.ConfigurableListableBeanFactory)
+ */
+ public void postProcessBeanFactory(BundleContext context, ConfigurableListableBeanFactory factory) throws BeansException, InvalidSyntaxException, BundleException {
+
+ // life-cycle for LogEnabled
+ OsgiLogProvider logProvider = new OsgiLogProvider();
+ LogEnabledBeanPostProcessor logProcessor = new LogEnabledBeanPostProcessor();
+ logProcessor.setLogProvider(logProvider);
+ logProcessor.setBeanFactory(factory);
+ factory.addBeanPostProcessor(logProcessor);
+
+
+ // Life-cycle for Configurable
+ OsgiConfigurationProvider confProvider = new OsgiConfigurationProvider(confDir);
+ CommonsConfigurableBeanPostProcessor confProcessor = new CommonsConfigurableBeanPostProcessor();
+ confProcessor.setConfigurationProvider(confProvider);
+ confProcessor.setBeanFactory(factory);
+ factory.addBeanPostProcessor(confProcessor);
+
+ // Support for JSR-250 annotations
+ CommonAnnotationBeanPostProcessor commAnnotationProcessor = new CommonAnnotationBeanPostProcessor();
+ commAnnotationProcessor.setBeanFactory(factory);
+ commAnnotationProcessor.setInitAnnotationType(PostConstruct.class);
+ commAnnotationProcessor.setDestroyAnnotationType(PreDestroy.class);
+ commAnnotationProcessor.setResourceFactory(factory);
+ factory.addBeanPostProcessor(commAnnotationProcessor);
+
+ // Add SpringInstanceFactory to the context so we can load the classes via it
+ SpringInstanceFactory instanceFactory = new SpringInstanceFactory();
+ instanceFactory.setBeanFactory(factory);
+ factory.registerSingleton("instanceFactory", instanceFactory);
+ }
+}
Added: james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java?rev=1049023&view=auto
==============================================================================
--- james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java (added)
+++ james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java Tue Dec 14 10:23:51 2010
@@ -0,0 +1,54 @@
+/****************************************************************
+ * 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. *
+ ****************************************************************/
+package org.apache.james.container.osgi;
+
+import java.io.File;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.james.container.spring.lifecycle.ConfigurationProvider;
+
+/**
+ * Load configuration files from the specified configuration directory
+ *
+ *
+ */
+public class OsgiConfigurationProvider implements ConfigurationProvider{
+
+ private String configDir;
+
+ public OsgiConfigurationProvider(String configDir) {
+ this.configDir = configDir;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.container.spring.lifecycle.ConfigurationProvider#getConfiguration(java.lang.String)
+ */
+ public HierarchicalConfiguration getConfiguration(String beanName) throws ConfigurationException {
+ XMLConfiguration config = new XMLConfiguration();
+ config.setDelimiterParsingDisabled(true);
+
+ config.load(new File(configDir +"/" + beanName + ".xml"));
+ return config;
+
+ }
+
+}
Added: james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java?rev=1049023&view=auto
==============================================================================
--- james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java (added)
+++ james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java Tue Dec 14 10:23:51 2010
@@ -0,0 +1,40 @@
+/****************************************************************
+ * 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. *
+ ****************************************************************/
+package org.apache.james.container.osgi;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.james.container.spring.lifecycle.LogProvider;
+
+
+/**
+ * Return {@link Log} for using within OSGI container
+ *
+ */
+public class OsgiLogProvider implements LogProvider{
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.container.spring.lifecycle.LogProvider#getLog(java.lang.String)
+ */
+ public Log getLog(String beanName) {
+ return LogFactory.getLog(beanName);
+ }
+
+}
Added: james/server/trunk/osgi/src/main/resources/META-INF/spring/extender/osgi-extender.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/src/main/resources/META-INF/spring/extender/osgi-extender.xml?rev=1049023&view=auto
==============================================================================
--- james/server/trunk/osgi/src/main/resources/META-INF/spring/extender/osgi-extender.xml (added)
+++ james/server/trunk/osgi/src/main/resources/META-INF/spring/extender/osgi-extender.xml Tue Dec 14 10:23:51 2010
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-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"
+ xmlns:ctx="http://www.springframework.org/schema/context"
+ xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
+
+
+
+ <!-- Configuration Admin entry -->
+ <osgix:cm-properties id="cmProps" persistent-id="org.apache.james"/>
+ <ctx:property-placeholder properties-ref="cmProps" />
+
+ <bean class="org.apache.james.container.osgi.JamesOsgiBeanFactoryPostProcessor">
+ <property name="configurationDirectory" value="${config.dir}"/>
+ </bean>
+ </beans>
\ No newline at end of file
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1049023&r1=1049022&r2=1049023&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Dec 14 10:23:51 2010
@@ -58,6 +58,7 @@
<module>mail-jdbc</module>
<module>mail-library</module>
<module>netty-socket</module>
+ <module>osgi</module>
<module>pop3server</module>
<module>remotemanager</module>
<module>smtpserver</module>
@@ -174,7 +175,6 @@
<excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
<instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name>
- <Bundle-SymbolicName>${james.osgi.symbolic.name}</Bundle-SymbolicName>
<Export-Package>${james.osgi.export}</Export-Package>
<Import-Package>${james.osgi.import}</Import-Package>
<DynamicImport-Package>${james.osgi.dynamic}</DynamicImport-Package>
@@ -270,6 +270,11 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-container-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-queue-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1193,6 +1198,18 @@
<artifactId>jaxb-impl</artifactId>
<version>2.2.1</version>
</dependency>
+
+ <!-- OSGI dependencies -->
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org