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 ie...@apache.org on 2013/02/07 11:58:32 UTC
svn commit: r1443402 - in /james/server/trunk: ./ container-spring/
data/data-file/ data/data-hbase/ data/data-jcr/ data/data-jdbc/
data/data-jpa/ data/data-ldap/ data/data-library/
data/data-library/src/main/java/org/apache/james/domainlist/lib/ dns-s...
Author: ieugen
Date: Thu Feb 7 10:58:31 2013
New Revision: 1443402
URL: http://svn.apache.org/viewvc?rev=1443402&view=rev
Log:
OSGi love
* commons-configuration feature is installable in Karaf
* replaced commmons-configuration dependency with repacked version from org.apache.servicemix.bundles.commons-configuration
Modified:
james/server/trunk/container-spring/pom.xml
james/server/trunk/data/data-file/pom.xml
james/server/trunk/data/data-hbase/pom.xml
james/server/trunk/data/data-jcr/pom.xml
james/server/trunk/data/data-jdbc/pom.xml
james/server/trunk/data/data-jpa/pom.xml
james/server/trunk/data/data-ldap/pom.xml
james/server/trunk/data/data-library/pom.xml
james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml
james/server/trunk/fetchmail/pom.xml
james/server/trunk/karaf/features/pom.xml
james/server/trunk/karaf/features/src/main/resources/features.xml
james/server/trunk/lifecycle-api/pom.xml
james/server/trunk/lifecycle-spring/pom.xml
james/server/trunk/mailetcontainer-camel/pom.xml
james/server/trunk/pom.xml
james/server/trunk/protocols/protocols-imap4/pom.xml
james/server/trunk/protocols/protocols-library/pom.xml
james/server/trunk/protocols/protocols-lmtp/pom.xml
james/server/trunk/protocols/protocols-pop3/pom.xml
james/server/trunk/protocols/protocols-smtp/pom.xml
Modified: james/server/trunk/container-spring/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Thu Feb 7 10:58:31 2013
@@ -109,8 +109,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
Modified: james/server/trunk/data/data-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/data/data-file/pom.xml (original)
+++ james/server/trunk/data/data-file/pom.xml Thu Feb 7 10:58:31 2013
@@ -60,8 +60,8 @@
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: james/server/trunk/data/data-hbase/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/pom.xml (original)
+++ james/server/trunk/data/data-hbase/pom.xml Thu Feb 7 10:58:31 2013
@@ -49,8 +49,8 @@
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: james/server/trunk/data/data-jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jcr/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/data/data-jcr/pom.xml (original)
+++ james/server/trunk/data/data-jcr/pom.xml Thu Feb 7 10:58:31 2013
@@ -44,8 +44,8 @@
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/data/data-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jdbc/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/data/data-jdbc/pom.xml (original)
+++ james/server/trunk/data/data-jdbc/pom.xml Thu Feb 7 10:58:31 2013
@@ -64,8 +64,8 @@
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: james/server/trunk/data/data-jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jpa/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/data/data-jpa/pom.xml (original)
+++ james/server/trunk/data/data-jpa/pom.xml Thu Feb 7 10:58:31 2013
@@ -52,8 +52,8 @@
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: james/server/trunk/data/data-ldap/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-ldap/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/data/data-ldap/pom.xml (original)
+++ james/server/trunk/data/data-ldap/pom.xml Thu Feb 7 10:58:31 2013
@@ -48,8 +48,8 @@
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: james/server/trunk/data/data-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/data/data-library/pom.xml (original)
+++ james/server/trunk/data/data-library/pom.xml Thu Feb 7 10:58:31 2013
@@ -57,8 +57,8 @@
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java (original)
+++ james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java Thu Feb 7 10:58:31 2013
@@ -61,9 +61,7 @@ public abstract class AbstractDomainList
return logger;
}
- /**
- * @see org.apache.james.lifecycle.api.Configurable#configure(HierarchicalConfiguration)
- */
+ @Override
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
defaultDomain = config.getString("defaultDomain", "localhost");
@@ -71,16 +69,12 @@ public abstract class AbstractDomainList
setAutoDetectIP(config.getBoolean("autodetectIP", true));
}
- /**
- * @see org.apache.james.domainlist.api.DomainList#getDefaultDomain()
- */
+ @Override
public String getDefaultDomain() throws DomainListException {
return defaultDomain;
}
- /**
- * @see org.apache.james.domainlist.api.DomainList#getDomains()
- */
+ @Override
public String[] getDomains() throws DomainListException {
List<String> domains = getDomainListInternal();
if (domains != null) {
Modified: james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml Thu Feb 7 10:58:31 2013
@@ -17,7 +17,8 @@
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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -43,8 +44,8 @@
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: james/server/trunk/fetchmail/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Thu Feb 7 10:58:31 2013
@@ -68,8 +68,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
Modified: james/server/trunk/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/features/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/karaf/features/pom.xml (original)
+++ james/server/trunk/karaf/features/pom.xml Thu Feb 7 10:58:31 2013
@@ -47,24 +47,25 @@
</executions>
</plugin>
- <plugin>
- <!-- validate the feature -->
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>features-maven-plugin</artifactId>
- <version>2.2.9</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>process-resources</phase>
- <goals>
- <goal>validate</goal>
- </goals>
- <configuration>
- <file>${project.build.directory}/features.xml</file>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <!-- TODO: enable after we make sure all components are OSGi ready -->
+ <!--<plugin>-->
+ <!--<!– validate the feature –>-->
+ <!--<groupId>org.apache.karaf.tooling</groupId>-->
+ <!--<artifactId>features-maven-plugin</artifactId>-->
+ <!--<version>2.2.9</version>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>validate</id>-->
+ <!--<phase>process-resources</phase>-->
+ <!--<goals>-->
+ <!--<goal>validate</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<file>${project.build.directory}/features.xml</file>-->
+ <!--</configuration>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
<!--
TODO: karaf-tooling project makes things easier - need to inspect !
Modified: james/server/trunk/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/features/src/main/resources/features.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/karaf/features/src/main/resources/features.xml (original)
+++ james/server/trunk/karaf/features/src/main/resources/features.xml Thu Feb 7 10:58:31 2013
@@ -11,7 +11,7 @@
<!-- james 3.0-beta5 features -->
<feature name="james-server-lifecycle-api" version="${project.version}">
<bundle>mvn:org.apache.james/james-server-lifecycle-api/${project.version}</bundle>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
</feature>
@@ -53,7 +53,7 @@
<feature version="${project.version}">james-server-lifecycle-api</feature>
<feature version="${project.version}">james-server-filesystem-api</feature>
<feature version="${project.version}">james-server-util</feature>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.james.protocols/protocols-api/${protocols.version}</bundle>
<bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle>
<bundle>mvn:io.netty/netty/${netty.version}</bundle>
@@ -93,7 +93,7 @@
<feature name="james-server-dnsservice-dnsjava" version="${project.version}">
<bundle>mvn:org.apache.james/james-server-dnsservice-dnsjava/${project.version}</bundle>
<feature version="${project.version}">james-server-dnsservice-api</feature>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
</feature>
@@ -121,7 +121,7 @@
<feature version="${project.version}">james-server-core</feature>
<feature version="${project.version}">james-server-dnsservice-apo</feature>
<bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}
</bundle>
@@ -134,7 +134,7 @@
<feature version="${project.version}">james-server-dnsservice-api</feature>
<feature version="${project.version}">james-server-filesystem-api</feature>
<bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
</feature>
@@ -144,7 +144,7 @@
<feature version="${project.version}">james-server-dnsservice-api</feature>
<feature version="${project.version}">james-server-data-api</feature>
<feature version="${project.version}">james-server-data-library</feature>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}
@@ -167,7 +167,7 @@
<feature version="${project.version}">james-server-data-api</feature>
<feature version="${project.version}">james-server-data-library</feature>
<feature version="${project.version}">james-server-core</feature>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
@@ -186,7 +186,7 @@
<feature version="${project.version}">james-server-data-library</feature>
<feature version="${project.version}">james-server-core</feature>
<feature version="${project.version}">james-server-dnsservice-api</feature>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
@@ -197,7 +197,7 @@
<feature version="${project.version}">james-server-lifecycle-api</feature>
<feature version="${project.version}">james-server-data-api</feature>
<feature version="${project.version}">james-server-util</feature>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
</feature>
@@ -209,7 +209,7 @@
<bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle>
<bundle>mvn:org.apache.james/apache-james-mailbox-store/${mailbox.version}</bundle>
<feature version="${mime4j.version}">apache-james-mime4j</feature>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.james/apache-james-mailbox-maildir/${mailbox.version}</bundle>
</feature>
@@ -226,7 +226,7 @@
<bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
<feature version="${project.version}">james-server-filesystem-api</feature>
<feature version="${project.version}">james-server-data-library</feature>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle>
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
@@ -248,7 +248,7 @@
<bundle>mvn:org.apache.james.jspf/apache-jspf-resolver/${apache-jspf-resolver.version}</bundle>
<bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle>
<bundle>mvn:org.apache.james.protocols/protocols-smtp/${protocols.version}</bundle>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle>
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
@@ -261,7 +261,7 @@
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
<bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bunldes/org.apache.servicemix.bundles.jutf7/${1.0.0_0-SNAPSHOT}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jutf7/1.0.0_0-SNAPSHOT</bundle>
</feature>
<feature name="james-server-protocols-imap" version="${project.version}">
@@ -269,13 +269,13 @@
<feature version="${project.version}">james-server-protocols-library</feature>
<feature version="${project.version}">james-server-filesystem-api</feature>
<feature version="${protocols.version}">james-protocols-imap</feature>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle>
<bundle>mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
<bundle>mvn:io.netty/netty/${netty.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bunldes/org.apache.servicemix.bundles.jutf7/${1.0.0_0-SNAPSHOT}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jutf7/1.0.0_0-SNAPSHOT</bundle>
</feature>
<feature name="james-server-protocols-smtp" version="${project.version}">
@@ -295,7 +295,7 @@
<bundle>mvn:org.apache.james.protocols/protocols-smtp/${protocols.version}</bundle>
<bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle>
<bundle>mvn:org.apache.james.jspf/apache-jspf-resolver/${apache-jspf-resolver.version}</bundle>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
@@ -315,18 +315,25 @@
<bundle>mvn:org.apache.james.protocols/protocols-lmtp/${protocols.version}</bundle>
<bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle>
<bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle>
- <feature version="${commons-configuration.version}">commons-configuration</feature>
+ <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
<bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
<bundle>mvn:io.netty/netty/${netty.version}</bundle>
<bundle>mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
</feature>
- <feature name="commons-configuration" version="${commons-configuration.version}">
- <bundle>mvn:commons-configuration/commons-configuration/${commons-configuration.version}
- </bundle>
+ <feature name="commons-configuration" version="${commons-configuration-osgi.version}">
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/1.8_1</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.8.3_1</bundle>
+ <!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jxpath/1.2_5</bundle>-->
+ <bundle>mvn:commons-jxpath/commons-jxpath/1.3</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_5</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/3.2.1_3</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_4</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
- <!--<bundle>mvn:org.ops4j.pax.logging/pax-logging-api/${pax-logging-api.version}</bundle>-->
+ <bundle>mvn:commons-digester/commons-digester/1.8.1</bundle>
+ <bundle>mvn:org.apache.commons/commons-jexl/2.1.1</bundle>
</feature>
</features>
\ No newline at end of file
Modified: james/server/trunk/lifecycle-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-api/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/lifecycle-api/pom.xml (original)
+++ james/server/trunk/lifecycle-api/pom.xml Thu Feb 7 10:58:31 2013
@@ -36,8 +36,8 @@
<dependencies>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: james/server/trunk/lifecycle-spring/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/lifecycle-spring/pom.xml (original)
+++ james/server/trunk/lifecycle-spring/pom.xml Thu Feb 7 10:58:31 2013
@@ -68,8 +68,8 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Thu Feb 7 10:58:31 2013
@@ -82,8 +82,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Feb 7 10:58:31 2013
@@ -143,7 +143,7 @@
<commons-codec.version>1.7</commons-codec.version>
<commons-cli.version>1.2</commons-cli.version>
<commons-pool.version>1.6</commons-pool.version>
- <commons-configuration.version>1.9</commons-configuration.version>
+ <commons-configuration-osgi.version>1.8_1</commons-configuration-osgi.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-net.version>3.2</commons-net.version>
<commons-beanutils-core.version>1.8.3</commons-beanutils-core.version>
@@ -768,9 +768,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${commons-configuration.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
+ <version>${commons-configuration-osgi.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-digester</artifactId>
Modified: james/server/trunk/protocols/protocols-imap4/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/pom.xml (original)
+++ james/server/trunk/protocols/protocols-imap4/pom.xml Thu Feb 7 10:58:31 2013
@@ -68,8 +68,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Modified: james/server/trunk/protocols/protocols-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/pom.xml (original)
+++ james/server/trunk/protocols/protocols-library/pom.xml Thu Feb 7 10:58:31 2013
@@ -72,8 +72,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Modified: james/server/trunk/protocols/protocols-lmtp/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-lmtp/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-lmtp/pom.xml (original)
+++ james/server/trunk/protocols/protocols-lmtp/pom.xml Thu Feb 7 10:58:31 2013
@@ -107,8 +107,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
Modified: james/server/trunk/protocols/protocols-pop3/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/pom.xml (original)
+++ james/server/trunk/protocols/protocols-pop3/pom.xml Thu Feb 7 10:58:31 2013
@@ -65,8 +65,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
Modified: james/server/trunk/protocols/protocols-smtp/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/pom.xml (original)
+++ james/server/trunk/protocols/protocols-smtp/pom.xml Thu Feb 7 10:58:31 2013
@@ -102,8 +102,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r1443402 - in /james/server/trunk: ./ container-spring/
data/data-file/ data/data-hbase/ data/data-jcr/ data/data-jdbc/ data/data-jpa/
data/data-ldap/ data/data-library/ data/data-library/src/main/java/org/apache/james/domainlist/lib/
dns-s...
Posted by Eric Charles <er...@u-mangate.com>.
Hi Ioan,
Why do you replace commons-configuration in container-spring.
This is not what we said.
Please revert.
Thx, Eric
On 07/02/2013 10:58, ieugen@apache.org wrote:
> Author: ieugen
> Date: Thu Feb 7 10:58:31 2013
> New Revision: 1443402
>
> URL: http://svn.apache.org/viewvc?rev=1443402&view=rev
> Log:
> OSGi love
>
> * commons-configuration feature is installable in Karaf
> * replaced commmons-configuration dependency with repacked version from org.apache.servicemix.bundles.commons-configuration
>
> Modified:
> james/server/trunk/container-spring/pom.xml
> james/server/trunk/data/data-file/pom.xml
> james/server/trunk/data/data-hbase/pom.xml
> james/server/trunk/data/data-jcr/pom.xml
> james/server/trunk/data/data-jdbc/pom.xml
> james/server/trunk/data/data-jpa/pom.xml
> james/server/trunk/data/data-ldap/pom.xml
> james/server/trunk/data/data-library/pom.xml
> james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
> james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml
> james/server/trunk/fetchmail/pom.xml
> james/server/trunk/karaf/features/pom.xml
> james/server/trunk/karaf/features/src/main/resources/features.xml
> james/server/trunk/lifecycle-api/pom.xml
> james/server/trunk/lifecycle-spring/pom.xml
> james/server/trunk/mailetcontainer-camel/pom.xml
> james/server/trunk/pom.xml
> james/server/trunk/protocols/protocols-imap4/pom.xml
> james/server/trunk/protocols/protocols-library/pom.xml
> james/server/trunk/protocols/protocols-lmtp/pom.xml
> james/server/trunk/protocols/protocols-pop3/pom.xml
> james/server/trunk/protocols/protocols-smtp/pom.xml
>
> Modified: james/server/trunk/container-spring/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/container-spring/pom.xml (original)
> +++ james/server/trunk/container-spring/pom.xml Thu Feb 7 10:58:31 2013
> @@ -109,8 +109,8 @@
> <scope>provided</scope>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>commons-collections</groupId>
>
> Modified: james/server/trunk/data/data-file/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/data/data-file/pom.xml (original)
> +++ james/server/trunk/data/data-file/pom.xml Thu Feb 7 10:58:31 2013
> @@ -60,8 +60,8 @@
> <artifactId>apache-mailet-api</artifactId>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>org.slf4j</groupId>
>
> Modified: james/server/trunk/data/data-hbase/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/data/data-hbase/pom.xml (original)
> +++ james/server/trunk/data/data-hbase/pom.xml Thu Feb 7 10:58:31 2013
> @@ -49,8 +49,8 @@
> <artifactId>james-server-data-library</artifactId>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>org.slf4j</groupId>
>
> Modified: james/server/trunk/data/data-jcr/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jcr/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/data/data-jcr/pom.xml (original)
> +++ james/server/trunk/data/data-jcr/pom.xml Thu Feb 7 10:58:31 2013
> @@ -44,8 +44,8 @@
> <artifactId>james-server-data-library</artifactId>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>org.apache.james</groupId>
>
> Modified: james/server/trunk/data/data-jdbc/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jdbc/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/data/data-jdbc/pom.xml (original)
> +++ james/server/trunk/data/data-jdbc/pom.xml Thu Feb 7 10:58:31 2013
> @@ -64,8 +64,8 @@
> <artifactId>apache-mailet-api</artifactId>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>org.slf4j</groupId>
>
> Modified: james/server/trunk/data/data-jpa/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jpa/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/data/data-jpa/pom.xml (original)
> +++ james/server/trunk/data/data-jpa/pom.xml Thu Feb 7 10:58:31 2013
> @@ -52,8 +52,8 @@
> <artifactId>james-server-data-library</artifactId>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>org.slf4j</groupId>
>
> Modified: james/server/trunk/data/data-ldap/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-ldap/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/data/data-ldap/pom.xml (original)
> +++ james/server/trunk/data/data-ldap/pom.xml Thu Feb 7 10:58:31 2013
> @@ -48,8 +48,8 @@
> <artifactId>james-server-util</artifactId>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>org.slf4j</groupId>
>
> Modified: james/server/trunk/data/data-library/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/data/data-library/pom.xml (original)
> +++ james/server/trunk/data/data-library/pom.xml Thu Feb 7 10:58:31 2013
> @@ -57,8 +57,8 @@
> </dependency>
>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>org.slf4j</groupId>
>
> Modified: james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
> URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java (original)
> +++ james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java Thu Feb 7 10:58:31 2013
> @@ -61,9 +61,7 @@ public abstract class AbstractDomainList
> return logger;
> }
>
> - /**
> - * @see org.apache.james.lifecycle.api.Configurable#configure(HierarchicalConfiguration)
> - */
> + @Override
> public void configure(HierarchicalConfiguration config) throws ConfigurationException {
> defaultDomain = config.getString("defaultDomain", "localhost");
>
> @@ -71,16 +69,12 @@ public abstract class AbstractDomainList
> setAutoDetectIP(config.getBoolean("autodetectIP", true));
> }
>
> - /**
> - * @see org.apache.james.domainlist.api.DomainList#getDefaultDomain()
> - */
> + @Override
> public String getDefaultDomain() throws DomainListException {
> return defaultDomain;
> }
>
> - /**
> - * @see org.apache.james.domainlist.api.DomainList#getDomains()
> - */
> + @Override
> public String[] getDomains() throws DomainListException {
> List<String> domains = getDomainListInternal();
> if (domains != null) {
>
> Modified: james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml (original)
> +++ james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml Thu Feb 7 10:58:31 2013
> @@ -17,7 +17,8 @@
> 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">
> +<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">
> <modelVersion>4.0.0</modelVersion>
>
> <parent>
> @@ -43,8 +44,8 @@
> <artifactId>james-server-lifecycle-api</artifactId>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>org.slf4j</groupId>
>
> Modified: james/server/trunk/fetchmail/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/fetchmail/pom.xml (original)
> +++ james/server/trunk/fetchmail/pom.xml Thu Feb 7 10:58:31 2013
> @@ -68,8 +68,8 @@
> <artifactId>slf4j-api</artifactId>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>${javax.mail.groupId}</groupId>
>
> Modified: james/server/trunk/karaf/features/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/features/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/karaf/features/pom.xml (original)
> +++ james/server/trunk/karaf/features/pom.xml Thu Feb 7 10:58:31 2013
> @@ -47,24 +47,25 @@
> </executions>
> </plugin>
>
> - <plugin>
> - <!-- validate the feature -->
> - <groupId>org.apache.karaf.tooling</groupId>
> - <artifactId>features-maven-plugin</artifactId>
> - <version>2.2.9</version>
> - <executions>
> - <execution>
> - <id>validate</id>
> - <phase>process-resources</phase>
> - <goals>
> - <goal>validate</goal>
> - </goals>
> - <configuration>
> - <file>${project.build.directory}/features.xml</file>
> - </configuration>
> - </execution>
> - </executions>
> - </plugin>
> + <!-- TODO: enable after we make sure all components are OSGi ready -->
> + <!--<plugin>-->
> + <!--<!– validate the feature –>-->
> + <!--<groupId>org.apache.karaf.tooling</groupId>-->
> + <!--<artifactId>features-maven-plugin</artifactId>-->
> + <!--<version>2.2.9</version>-->
> + <!--<executions>-->
> + <!--<execution>-->
> + <!--<id>validate</id>-->
> + <!--<phase>process-resources</phase>-->
> + <!--<goals>-->
> + <!--<goal>validate</goal>-->
> + <!--</goals>-->
> + <!--<configuration>-->
> + <!--<file>${project.build.directory}/features.xml</file>-->
> + <!--</configuration>-->
> + <!--</execution>-->
> + <!--</executions>-->
> + <!--</plugin>-->
>
> <!--
> TODO: karaf-tooling project makes things easier - need to inspect !
>
> Modified: james/server/trunk/karaf/features/src/main/resources/features.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/features/src/main/resources/features.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/karaf/features/src/main/resources/features.xml (original)
> +++ james/server/trunk/karaf/features/src/main/resources/features.xml Thu Feb 7 10:58:31 2013
> @@ -11,7 +11,7 @@
> <!-- james 3.0-beta5 features -->
> <feature name="james-server-lifecycle-api" version="${project.version}">
> <bundle>mvn:org.apache.james/james-server-lifecycle-api/${project.version}</bundle>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
> </feature>
>
> @@ -53,7 +53,7 @@
> <feature version="${project.version}">james-server-lifecycle-api</feature>
> <feature version="${project.version}">james-server-filesystem-api</feature>
> <feature version="${project.version}">james-server-util</feature>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.apache.james.protocols/protocols-api/${protocols.version}</bundle>
> <bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle>
> <bundle>mvn:io.netty/netty/${netty.version}</bundle>
> @@ -93,7 +93,7 @@
> <feature name="james-server-dnsservice-dnsjava" version="${project.version}">
> <bundle>mvn:org.apache.james/james-server-dnsservice-dnsjava/${project.version}</bundle>
> <feature version="${project.version}">james-server-dnsservice-api</feature>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> </feature>
> @@ -121,7 +121,7 @@
> <feature version="${project.version}">james-server-core</feature>
> <feature version="${project.version}">james-server-dnsservice-apo</feature>
> <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}
> </bundle>
> @@ -134,7 +134,7 @@
> <feature version="${project.version}">james-server-dnsservice-api</feature>
> <feature version="${project.version}">james-server-filesystem-api</feature>
> <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> </feature>
>
> @@ -144,7 +144,7 @@
> <feature version="${project.version}">james-server-dnsservice-api</feature>
> <feature version="${project.version}">james-server-data-api</feature>
> <feature version="${project.version}">james-server-data-library</feature>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}
> @@ -167,7 +167,7 @@
> <feature version="${project.version}">james-server-data-api</feature>
> <feature version="${project.version}">james-server-data-library</feature>
> <feature version="${project.version}">james-server-core</feature>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
> @@ -186,7 +186,7 @@
> <feature version="${project.version}">james-server-data-library</feature>
> <feature version="${project.version}">james-server-core</feature>
> <feature version="${project.version}">james-server-dnsservice-api</feature>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
> @@ -197,7 +197,7 @@
> <feature version="${project.version}">james-server-lifecycle-api</feature>
> <feature version="${project.version}">james-server-data-api</feature>
> <feature version="${project.version}">james-server-util</feature>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
> </feature>
>
> @@ -209,7 +209,7 @@
> <bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle>
> <bundle>mvn:org.apache.james/apache-james-mailbox-store/${mailbox.version}</bundle>
> <feature version="${mime4j.version}">apache-james-mime4j</feature>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.apache.james/apache-james-mailbox-maildir/${mailbox.version}</bundle>
> </feature>
>
> @@ -226,7 +226,7 @@
> <bundle>mvn:org.apache.james/apache-mailet-api/${mailet.version}</bundle>
> <feature version="${project.version}">james-server-filesystem-api</feature>
> <feature version="${project.version}">james-server-data-library</feature>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle>
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
> @@ -248,7 +248,7 @@
> <bundle>mvn:org.apache.james.jspf/apache-jspf-resolver/${apache-jspf-resolver.version}</bundle>
> <bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle>
> <bundle>mvn:org.apache.james.protocols/protocols-smtp/${protocols.version}</bundle>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle>
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
> @@ -261,7 +261,7 @@
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
> <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
> - <bundle>mvn:org.apache.servicemix.bunldes/org.apache.servicemix.bundles.jutf7/${1.0.0_0-SNAPSHOT}</bundle>
> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jutf7/1.0.0_0-SNAPSHOT</bundle>
> </feature>
>
> <feature name="james-server-protocols-imap" version="${project.version}">
> @@ -269,13 +269,13 @@
> <feature version="${project.version}">james-server-protocols-library</feature>
> <feature version="${project.version}">james-server-filesystem-api</feature>
> <feature version="${protocols.version}">james-protocols-imap</feature>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
> <bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle>
> <bundle>mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
> <bundle>mvn:io.netty/netty/${netty.version}</bundle>
> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
> - <bundle>mvn:org.apache.servicemix.bunldes/org.apache.servicemix.bundles.jutf7/${1.0.0_0-SNAPSHOT}</bundle>
> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jutf7/1.0.0_0-SNAPSHOT</bundle>
> </feature>
>
> <feature name="james-server-protocols-smtp" version="${project.version}">
> @@ -295,7 +295,7 @@
> <bundle>mvn:org.apache.james.protocols/protocols-smtp/${protocols.version}</bundle>
> <bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle>
> <bundle>mvn:org.apache.james.jspf/apache-jspf-resolver/${apache-jspf-resolver.version}</bundle>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
>
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
> @@ -315,18 +315,25 @@
> <bundle>mvn:org.apache.james.protocols/protocols-lmtp/${protocols.version}</bundle>
> <bundle>mvn:org.apache.james.protocols/protocols-netty/${protocols.version}</bundle>
> <bundle>mvn:org.apache.james/apache-james-mailbox-api/${mailbox.version}</bundle>
> - <feature version="${commons-configuration.version}">commons-configuration</feature>
> + <feature version="${commons-configuration-osgi.version}">commons-configuration</feature>
> <bundle>mvn:org.apache.geronimo.javamail/geronimo-javamail_1.4_mail/${geronimo-javamail.version}</bundle>
> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation-spec.version}</bundle>
> <bundle>mvn:io.netty/netty/${netty.version}</bundle>
> <bundle>mvn:org.slf4j/slf4j-api/${slf4j.version}</bundle>
> </feature>
>
> - <feature name="commons-configuration" version="${commons-configuration.version}">
> - <bundle>mvn:commons-configuration/commons-configuration/${commons-configuration.version}
> - </bundle>
> + <feature name="commons-configuration" version="${commons-configuration-osgi.version}">
> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/1.8_1</bundle>
> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.8.3_1</bundle>
> + <!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jxpath/1.2_5</bundle>-->
> + <bundle>mvn:commons-jxpath/commons-jxpath/1.3</bundle>
> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_5</bundle>
> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/3.2.1_3</bundle>
> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_4</bundle>
> + <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
> <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
> - <!--<bundle>mvn:org.ops4j.pax.logging/pax-logging-api/${pax-logging-api.version}</bundle>-->
> + <bundle>mvn:commons-digester/commons-digester/1.8.1</bundle>
> + <bundle>mvn:org.apache.commons/commons-jexl/2.1.1</bundle>
> </feature>
>
> </features>
> \ No newline at end of file
>
> Modified: james/server/trunk/lifecycle-api/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-api/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/lifecycle-api/pom.xml (original)
> +++ james/server/trunk/lifecycle-api/pom.xml Thu Feb 7 10:58:31 2013
> @@ -36,8 +36,8 @@
>
> <dependencies>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>org.slf4j</groupId>
>
> Modified: james/server/trunk/lifecycle-spring/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/lifecycle-spring/pom.xml (original)
> +++ james/server/trunk/lifecycle-spring/pom.xml Thu Feb 7 10:58:31 2013
> @@ -68,8 +68,8 @@
> <artifactId>org.osgi.core</artifactId>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>org.slf4j</groupId>
>
> Modified: james/server/trunk/mailetcontainer-camel/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/mailetcontainer-camel/pom.xml (original)
> +++ james/server/trunk/mailetcontainer-camel/pom.xml Thu Feb 7 10:58:31 2013
> @@ -82,8 +82,8 @@
> <artifactId>slf4j-api</artifactId>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>${javax.mail.groupId}</groupId>
>
> Modified: james/server/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/pom.xml (original)
> +++ james/server/trunk/pom.xml Thu Feb 7 10:58:31 2013
> @@ -143,7 +143,7 @@
> <commons-codec.version>1.7</commons-codec.version>
> <commons-cli.version>1.2</commons-cli.version>
> <commons-pool.version>1.6</commons-pool.version>
> - <commons-configuration.version>1.9</commons-configuration.version>
> + <commons-configuration-osgi.version>1.8_1</commons-configuration-osgi.version>
> <commons-dbcp.version>1.4</commons-dbcp.version>
> <commons-net.version>3.2</commons-net.version>
> <commons-beanutils-core.version>1.8.3</commons-beanutils-core.version>
> @@ -768,9 +768,9 @@
> </exclusions>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> - <version>${commons-configuration.version}</version>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> + <version>${commons-configuration-osgi.version}</version>
> <exclusions>
> <exclusion>
> <artifactId>commons-digester</artifactId>
>
> Modified: james/server/trunk/protocols/protocols-imap4/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/protocols/protocols-imap4/pom.xml (original)
> +++ james/server/trunk/protocols/protocols-imap4/pom.xml Thu Feb 7 10:58:31 2013
> @@ -68,8 +68,8 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>io.netty</groupId>
>
> Modified: james/server/trunk/protocols/protocols-library/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/protocols/protocols-library/pom.xml (original)
> +++ james/server/trunk/protocols/protocols-library/pom.xml Thu Feb 7 10:58:31 2013
> @@ -72,8 +72,8 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>io.netty</groupId>
>
> Modified: james/server/trunk/protocols/protocols-lmtp/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-lmtp/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/protocols/protocols-lmtp/pom.xml (original)
> +++ james/server/trunk/protocols/protocols-lmtp/pom.xml Thu Feb 7 10:58:31 2013
> @@ -107,8 +107,8 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>${javax.mail.groupId}</groupId>
>
> Modified: james/server/trunk/protocols/protocols-pop3/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/protocols/protocols-pop3/pom.xml (original)
> +++ james/server/trunk/protocols/protocols-pop3/pom.xml Thu Feb 7 10:58:31 2013
> @@ -65,8 +65,8 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>${javax.mail.groupId}</groupId>
>
> Modified: james/server/trunk/protocols/protocols-smtp/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/pom.xml?rev=1443402&r1=1443401&r2=1443402&view=diff
> ==============================================================================
> --- james/server/trunk/protocols/protocols-smtp/pom.xml (original)
> +++ james/server/trunk/protocols/protocols-smtp/pom.xml Thu Feb 7 10:58:31 2013
> @@ -102,8 +102,8 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> - <groupId>commons-configuration</groupId>
> - <artifactId>commons-configuration</artifactId>
> + <groupId>org.apache.servicemix.bundles</groupId>
> + <artifactId>org.apache.servicemix.bundles.commons-configuration</artifactId>
> </dependency>
> <dependency>
> <groupId>${javax.mail.groupId}</groupId>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
> For additional commands, e-mail: server-dev-help@james.apache.org
>
--
@echarles
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org