Author: ieugen
Date: Wed Feb 27 01:30:12 2013
New Revision: 1450569
URL: http://svn.apache.org/r1450569
Log:
JAMES-1446 Osgi love
* using the custom distribution in integration tests
* switched to new versioning schema (to make the Karaf integration tests work)
* fixed some XML XSD schema urls
Modified:
james/server/trunk/.gitignore
james/server/trunk/app/pom.xml
james/server/trunk/cli/pom.xml
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
james/server/trunk/core/pom.xml
james/server/trunk/data/data-api/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/dns-service/dnsservice-api/pom.xml
james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml
james/server/trunk/dns-service/dnsservice-library/pom.xml
james/server/trunk/fetchmail/pom.xml
james/server/trunk/filesystem-api/pom.xml
james/server/trunk/karaf/distribution/pom.xml
james/server/trunk/karaf/features/pom.xml
james/server/trunk/karaf/integration/pom.xml
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java
james/server/trunk/lifecycle-api/pom.xml
james/server/trunk/mailbox-adapter/pom.xml
james/server/trunk/mailetcontainer-api/pom.xml
james/server/trunk/mailetcontainer-camel/pom.xml
james/server/trunk/mailets/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
james/server/trunk/queue/queue-activemq/pom.xml
james/server/trunk/queue/queue-api/pom.xml
james/server/trunk/queue/queue-file/pom.xml
james/server/trunk/queue/queue-jms/pom.xml
james/server/trunk/spring/pom.xml
james/server/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
james/server/trunk/util/pom.xml
Modified: james/server/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/james/server/trunk/.gitignore?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/.gitignore (original)
+++ james/server/trunk/.gitignore Wed Feb 27 01:30:12 2013
@@ -2,3 +2,4 @@
target
*.iml
*.log
+var/
Modified: james/server/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/app/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/app/pom.xml (original)
+++ james/server/trunk/app/pom.xml Wed Feb 27 01:30:12 2013
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-server</artifactId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/cli/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/cli/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/cli/pom.xml (original)
+++ james/server/trunk/cli/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified:
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
---
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
(original)
+++
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
Wed Feb 27 01:30:12 2013
@@ -18,9 +18,11 @@
****************************************************************/
package org.apache.james.cli.probe.impl;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
+import org.apache.james.cli.probe.ServerProbe;
+import org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean;
+import org.apache.james.domainlist.api.DomainListManagementMBean;
+import org.apache.james.rrt.api.RecipientRewriteTableManagementMBean;
+import org.apache.james.user.api.UsersRepositoryManagementMBean;
import javax.management.MBeanServerConnection;
import javax.management.MBeanServerInvocationHandler;
@@ -29,246 +31,155 @@ import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
-import org.apache.james.cli.probe.ServerProbe;
-import org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean;
-import org.apache.james.domainlist.api.DomainListManagementMBean;
-import org.apache.james.rrt.api.RecipientRewriteTableManagementMBean;
-import org.apache.james.user.api.UsersRepositoryManagementMBean;
-
-/**
- * @author eric
- *
- */
public class JmxServerProbe implements ServerProbe {
- // TODO: Move this to somewhere else
- private final static String DOMAINLIST_OBJECT_NAME =
"org.apache.james:type=component,name=domainlist";
- private final static String VIRTUALUSERTABLE_OBJECT_NAME =
"org.apache.james:type=component,name=recipientrewritetable";
- private final static String USERSREPOSITORY_OBJECT_NAME =
"org.apache.james:type=component,name=usersrepository";
- private final static String MAILBOXCOPIER_OBJECT_NAME =
"org.apache.james:type=component,name=mailboxcopier";
-
- private MBeanServerConnection mbeanServerConn;
- private DomainListManagementMBean domainListProcxy;
- private RecipientRewriteTableManagementMBean virtualUserTableProxy;
- private UsersRepositoryManagementMBean usersRepositoryProxy;
- private MailboxCopierManagementMBean mailboxCopierManagement;
-
- private static final String fmtUrl =
"service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi";
- private static final int defaultPort = 9999;
- private final String host;
- private final int port;
-
- /**
- * Creates a ServerProbe using the specified JMX host and port.
- *
- * @param host
- * hostname or IP address of the JMX agent
- * @param port
- * TCP port of the remote JMX agent
- * @throws IOException
- * on connection failures
- */
- public JmxServerProbe(String host, int port) throws IOException,
InterruptedException {
- this.host = host;
- this.port = port;
- connect();
- }
-
- /**
- * Creates a NodeProbe using the specified JMX host and default port.
- *
- * @param host
- * hostname or IP address of the JMX agent
- * @throws IOException
- * on connection failures
- */
- public JmxServerProbe(String host) throws IOException,
InterruptedException {
- this.host = host;
- this.port = defaultPort;
- connect();
- }
-
- /**
- * Create a connection to the JMX agent and setup the M[X]Bean proxies.
- *
- * @throws IOException
- * on connection failures
- */
- private void connect() throws IOException {
- JMXServiceURL jmxUrl = new JMXServiceURL(String.format(fmtUrl,
host, port));
- JMXConnector jmxc = JMXConnectorFactory.connect(jmxUrl, null);
- mbeanServerConn = jmxc.getMBeanServerConnection();
-
- try {
- ObjectName name = new
ObjectName(DOMAINLIST_OBJECT_NAME);
- domainListProcxy =
MBeanServerInvocationHandler.newProxyInstance(
- mbeanServerConn, name,
DomainListManagementMBean.class, true);
- name = new ObjectName(VIRTUALUSERTABLE_OBJECT_NAME);
- virtualUserTableProxy = MBeanServerInvocationHandler
+ // TODO: Move this to somewhere else
+ private final static String DOMAINLIST_OBJECT_NAME =
"org.apache.james:type=component,name=domainlist";
+ private final static String VIRTUALUSERTABLE_OBJECT_NAME =
"org.apache.james:type=component,name=recipientrewritetable";
+ private final static String USERSREPOSITORY_OBJECT_NAME =
"org.apache.james:type=component,name=usersrepository";
+ private final static String MAILBOXCOPIER_OBJECT_NAME =
"org.apache.james:type=component,name=mailboxcopier";
+
+ private MBeanServerConnection mbeanServerConn;
+ private DomainListManagementMBean domainListProcxy;
+ private RecipientRewriteTableManagementMBean virtualUserTableProxy;
+ private UsersRepositoryManagementMBean usersRepositoryProxy;
+ private MailboxCopierManagementMBean mailboxCopierManagement;
+
+ private static final String fmtUrl =
"service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi";
+ private static final int defaultPort = 9999;
+ private final String host;
+ private final int port;
+
+ /**
+ * Creates a ServerProbe using the specified JMX host and port.
+ *
+ * @param host hostname or IP address of the JMX agent
+ * @param port TCP port of the remote JMX agent
+ * @throws IOException on connection failures
+ */
+ public JmxServerProbe(String host, int port) throws IOException,
InterruptedException {
+ this.host = host;
+ this.port = port;
+ connect();
+ }
+
+ /**
+ * Creates a NodeProbe using the specified JMX host and default port.
+ *
+ * @param host hostname or IP address of the JMX agent
+ * @throws IOException on connection failures
+ */
+ public JmxServerProbe(String host) throws IOException,
InterruptedException {
+ this.host = host;
+ this.port = defaultPort;
+ connect();
+ }
+
+ /**
+ * Create a connection to the JMX agent and setup the M[X]Bean proxies.
+ *
+ * @throws IOException on connection failures
+ */
+ private void connect() throws IOException {
+ JMXServiceURL jmxUrl = new JMXServiceURL(String.format(fmtUrl, host,
port));
+ JMXConnector jmxc = JMXConnectorFactory.connect(jmxUrl, null);
+ mbeanServerConn = jmxc.getMBeanServerConnection();
+
+ try {
+ ObjectName name = new ObjectName(DOMAINLIST_OBJECT_NAME);
+ domainListProcxy = MBeanServerInvocationHandler.newProxyInstance(
+ mbeanServerConn, name, DomainListManagementMBean.class,
true);
+ name = new ObjectName(VIRTUALUSERTABLE_OBJECT_NAME);
+ virtualUserTableProxy = MBeanServerInvocationHandler
.newProxyInstance(mbeanServerConn, name,
RecipientRewriteTableManagementMBean.class, true);
- name = new ObjectName(USERSREPOSITORY_OBJECT_NAME);
- usersRepositoryProxy =
MBeanServerInvocationHandler.newProxyInstance(
- mbeanServerConn, name,
UsersRepositoryManagementMBean.class, true);
- name = new ObjectName(MAILBOXCOPIER_OBJECT_NAME);
- mailboxCopierManagement =
MBeanServerInvocationHandler.newProxyInstance(
- mbeanServerConn, name,
MailboxCopierManagementMBean.class, true);
- } catch (MalformedObjectNameException e) {
- throw new RuntimeException("Invalid ObjectName? Please
report this as a bug.", e);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.cli.probe.ServerProbe#addUser(java.lang.String,
- * java.lang.String)
- */
- @Override
- public void addUser(String userName, String password) throws Exception {
- usersRepositoryProxy.addUser(userName, password);
- }
-
- /*
- * @see
org.apache.james.cli.probe.ServerProbe#removeUser(java.lang.String)
- */
- @Override
- public void removeUser(String username) throws Exception {
- usersRepositoryProxy.deleteUser(username);
- }
-
- /*
- * @see org.apache.james.cli.probe.ServerProbe#listUsers()
- */
- @Override
- public String[] listUsers() throws Exception {
- return usersRepositoryProxy.listAllUsers();
- }
-
- /*
- * @see
org.apache.james.cli.probe.ServerProbe#setPassword(java.lang.String,
- * java.lang.String)
- */
- @Override
- public void setPassword(String userName, String password) throws
Exception {
- usersRepositoryProxy.setPassword(userName, password);
- }
-
- /*
- * @see
- *
org.apache.james.cli.probe.ServerProbe#containsDomain(java.lang.String)
- */
- @Override
- public boolean containsDomain(String domain) throws Exception {
- return domainListProcxy.containsDomain(domain);
- }
-
- /*
- * @see
org.apache.james.cli.probe.ServerProbe#addDomain(java.lang.String)
- */
- @Override
- public void addDomain(String domain) throws Exception {
- domainListProcxy.addDomain(domain);
- }
-
- /*
- * @see
- * org.apache.james.cli.probe.ServerProbe#removeDomain(java.lang.String)
- */
- @Override
- public void removeDomain(String domain) throws Exception {
- domainListProcxy.removeDomain(domain);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.cli.probe.ServerProbe#listDomains()
- */
- @Override
- public String[] listDomains() throws Exception {
- return domainListProcxy.getDomains();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.cli.probe.ServerProbe#listMappings()
- */
- @Override
- public Map<String, Collection<String>> listMappings() throws Exception {
- return virtualUserTableProxy.getAllMappings();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.james.cli.probe.ServerProbe#addAddressMapping(java.lang.String
- * , java.lang.String, java.lang.String)
- */
- @Override
- public void addAddressMapping(String user, String domain, String
toAddress) throws Exception {
- virtualUserTableProxy.addAddressMapping(user, domain,
toAddress);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.james.cli.probe.ServerProbe#removeAddressMapping(java.lang
- * .String, java.lang.String, java.lang.String)
- */
- @Override
- public void removeAddressMapping(String user, String domain, String
fromAddress) throws Exception {
- virtualUserTableProxy.removeAddressMapping(user, domain,
fromAddress);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.james.cli.probe.ServerProbe#listUserDomainMappings(java.lang
- * .String, java.lang.String)
- */
- @Override
- public Collection<String> listUserDomainMappings(String user, String
domain) throws Exception {
- return virtualUserTableProxy.getUserDomainMappings(user,
domain);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.james.cli.probe.ServerProbe#addRegexMapping(java.lang.String,
- * java.lang.String, java.lang.String)
- */
- @Override
- public void addRegexMapping(String user, String domain, String regex)
throws Exception {
- virtualUserTableProxy.addRegexMapping(user, domain, regex);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.james.cli.probe.ServerProbe#removeRegexMapping(java.lang.String
- * , java.lang.String, java.lang.String)
- */
- @Override
- public void removeRegexMapping(String user, String domain, String
regex) throws Exception {
- virtualUserTableProxy.removeRegexMapping(user, domain, regex);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
org.apache.james.cli.probe.ServerProbe#copyMailbox(java.lang.String,
- * java.lang.String)
- */
- @Override
- public void copyMailbox(String srcBean, String dstBean) throws
Exception {
- mailboxCopierManagement.copy(srcBean, dstBean);
- }
+ name = new ObjectName(USERSREPOSITORY_OBJECT_NAME);
+ usersRepositoryProxy =
MBeanServerInvocationHandler.newProxyInstance(
+ mbeanServerConn, name,
UsersRepositoryManagementMBean.class, true);
+ name = new ObjectName(MAILBOXCOPIER_OBJECT_NAME);
+ mailboxCopierManagement =
MBeanServerInvocationHandler.newProxyInstance(
+ mbeanServerConn, name, MailboxCopierManagementMBean.class,
true);
+ } catch (MalformedObjectNameException e) {
+ throw new RuntimeException("Invalid ObjectName? Please report this
as a bug.", e);
+ }
+ }
+
+ @Override
+ public void addUser(String userName, String password) throws Exception {
+ usersRepositoryProxy.addUser(userName, password);
+ }
+
+ @Override
+ public void removeUser(String username) throws Exception {
+ usersRepositoryProxy.deleteUser(username);
+ }
+
+ @Override
+ public String[] listUsers() throws Exception {
+ return usersRepositoryProxy.listAllUsers();
+ }
+
+ @Override
+ public void setPassword(String userName, String password) throws Exception
{
+ usersRepositoryProxy.setPassword(userName, password);
+ }
+
+ @Override
+ public boolean containsDomain(String domain) throws Exception {
+ return domainListProcxy.containsDomain(domain);
+ }
+
+ @Override
+ public void addDomain(String domain) throws Exception {
+ domainListProcxy.addDomain(domain);
+ }
+
+ @Override
+ public void removeDomain(String domain) throws Exception {
+ domainListProcxy.removeDomain(domain);
+ }
+
+ @Override
+ public String[] listDomains() throws Exception {
+ return domainListProcxy.getDomains();
+ }
+
+ @Override
+ public Map<String, Collection<String>> listMappings() throws Exception {
+ return virtualUserTableProxy.getAllMappings();
+ }
+
+ @Override
+ public void addAddressMapping(String user, String domain, String
toAddress) throws Exception {
+ virtualUserTableProxy.addAddressMapping(user, domain, toAddress);
+ }
+
+ @Override
+ public void removeAddressMapping(String user, String domain, String
fromAddress) throws Exception {
+ virtualUserTableProxy.removeAddressMapping(user, domain, fromAddress);
+ }
+
+ @Override
+ public Collection<String> listUserDomainMappings(String user, String
domain) throws Exception {
+ return virtualUserTableProxy.getUserDomainMappings(user, domain);
+ }
+
+ @Override
+ public void addRegexMapping(String user, String domain, String regex)
throws Exception {
+ virtualUserTableProxy.addRegexMapping(user, domain, regex);
+ }
+
+ @Override
+ public void removeRegexMapping(String user, String domain, String regex)
throws Exception {
+ virtualUserTableProxy.removeRegexMapping(user, domain, regex);
+ }
+
+ @Override
+ public void copyMailbox(String srcBean, String dstBean) throws Exception {
+ mailboxCopierManagement.copy(srcBean, dstBean);
+ }
}
Modified: james/server/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/core/pom.xml (original)
+++ james/server/trunk/core/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/data/data-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-api/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/data/data-api/pom.xml (original)
+++ james/server/trunk/data/data-api/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/data/data-file/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-file/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/data/data-file/pom.xml (original)
+++ james/server/trunk/data/data-file/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/data/data-hbase/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/pom.xml (original)
+++ james/server/trunk/data/data-hbase/pom.xml Wed Feb 27 01:30:12 2013
@@ -23,7 +23,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/data/data-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-jcr/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/data/data-jcr/pom.xml (original)
+++ james/server/trunk/data/data-jcr/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/data/data-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-jdbc/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/data/data-jdbc/pom.xml (original)
+++ james/server/trunk/data/data-jdbc/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/data/data-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-jpa/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/data/data-jpa/pom.xml (original)
+++ james/server/trunk/data/data-jpa/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/data/data-ldap/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-ldap/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/data/data-ldap/pom.xml (original)
+++ james/server/trunk/data/data-ldap/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/data/data-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-library/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/data/data-library/pom.xml (original)
+++ james/server/trunk/data/data-library/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/dns-service/dnsservice-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/dns-service/dnsservice-api/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/dns-service/dnsservice-api/pom.xml (original)
+++ james/server/trunk/dns-service/dnsservice-api/pom.xml Wed Feb 27 01:30:12
2013
@@ -23,7 +23,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
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=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dns-service/dnsservice-dnsjava/pom.xml Wed Feb 27
01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/dns-service/dnsservice-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/dns-service/dnsservice-library/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/dns-service/dnsservice-library/pom.xml (original)
+++ james/server/trunk/dns-service/dnsservice-library/pom.xml Wed Feb 27
01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/fetchmail/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/filesystem-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/filesystem-api/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/filesystem-api/pom.xml (original)
+++ james/server/trunk/filesystem-api/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/karaf/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/distribution/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/karaf/distribution/pom.xml (original)
+++ james/server/trunk/karaf/distribution/pom.xml Wed Feb 27 01:30:12 2013
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-server</artifactId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -30,6 +30,12 @@
<type>xml</type>
<classifier>features</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.james.karaf</groupId>
+ <artifactId>james-karaf-features</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
</dependencies>
Modified: james/server/trunk/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/features/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/karaf/features/pom.xml (original)
+++ james/server/trunk/karaf/features/pom.xml Wed Feb 27 01:30:12 2013
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-server</artifactId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/karaf/integration/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/karaf/integration/pom.xml (original)
+++ james/server/trunk/karaf/integration/pom.xml Wed Feb 27 01:30:12 2013
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-server</artifactId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -83,9 +83,9 @@
<!-- Apache Felix Karaf integration -->
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <version>${karaf.version}</version>
+ <groupId>org.apache.james.karaf</groupId>
+ <artifactId>james-karaf-distribution</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
<type>tar.gz</type>
<exclusions>
Modified:
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
---
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java
(original)
+++
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java
Wed Feb 27 01:30:12 2013
@@ -22,7 +22,7 @@ import org.ops4j.pax.exam.junit.ExamReac
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import org.ops4j.pax.exam.spi.reactors.EagerSingleStagedReactorFactory;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
@@ -38,12 +38,15 @@ import java.util.concurrent.TimeUnit;
* Base class for integration testing with Karaf.
*/
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class KarafLiveTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(KarafLiveTestSupport.class);
public static final int WAIT_30_SECONDS = 30000;
+ private static final String DISTRIBUTION_GROUP_ID =
"org.apache.james.karaf";
+ private static final String DISTRIBUTION_ARTIFACT_ID =
"james-karaf-distribution";
+
@Inject
FeaturesService features;
@@ -54,15 +57,19 @@ public class KarafLiveTestSupport {
@Configuration
public static Option[] configuration() throws Exception {
- MavenArtifactUrlReference karafUrl =
maven().groupId("org.apache.karaf")
- .artifactId("apache-karaf")
- .version("2.3.0")
+
+ MavenArtifactUrlReference karafUrl =
maven().groupId(DISTRIBUTION_GROUP_ID)
+ .artifactId(DISTRIBUTION_ARTIFACT_ID)
+ .versionAsInProject()
.type("tar.gz");
String jamesFeaturesVersion =
MavenUtils.getArtifactVersion("org.apache.james.karaf", "james-karaf-features");
return new Option[]{
-
karafDistributionConfiguration().frameworkUrl(karafUrl).karafVersion("2.3.0").name("Apache
Karaf")
+ karafDistributionConfiguration()
+ .frameworkUrl(karafUrl)
+ .karafVersion(getDistributionVersionAsInProject())
+ .name("Apache Karaf")
.unpackDirectory(new File("target/exam")),
logLevel(LogLevelOption.LogLevel.INFO),
new
KarafDistributionConfigurationFilePutOption("etc/custom.properties",
@@ -75,6 +82,10 @@ public class KarafLiveTestSupport {
};
}
+ public static String getDistributionVersionAsInProject() {
+ return MavenUtils.asInProject().getVersion(DISTRIBUTION_GROUP_ID,
DISTRIBUTION_ARTIFACT_ID);
+ }
+
@Before
public void setUp() {
featuresVersion = System.getProperty("james-karaf-features");
Modified: james/server/trunk/lifecycle-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/lifecycle-api/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/lifecycle-api/pom.xml (original)
+++ james/server/trunk/lifecycle-api/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/mailbox-adapter/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/pom.xml (original)
+++ james/server/trunk/mailbox-adapter/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/mailetcontainer-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-api/pom.xml (original)
+++ james/server/trunk/mailetcontainer-api/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/mailets/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Feb 27 01:30:12 2013
@@ -32,7 +32,7 @@
</parent>
<artifactId>james-server</artifactId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache James :: Server</name>
@@ -55,6 +55,7 @@
<modules>
<module>app</module>
+ <module>karaf/distribution</module>
<module>karaf/features</module>
<module>karaf/integration</module>
@@ -81,7 +82,7 @@
<module>data/data-jdbc</module>
<module>data/data-file</module>
<module>data/data-ldap</module>
- <!--<module>data/data-hbase</module>-->
+ <module>data/data-hbase</module>
<module>protocols/protocols-imap4</module>
<module>protocols/protocols-library</module>
@@ -1141,9 +1142,9 @@
<!-- Apache Felix Karaf integration -->
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <version>${karaf.version}</version>
+ <groupId>org.apache.james.karaf</groupId>
+ <artifactId>james-karaf-distribution</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
<type>tar.gz</type>
<exclusions>
Modified: james/server/trunk/protocols/protocols-imap4/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/pom.xml (original)
+++ james/server/trunk/protocols/protocols-imap4/pom.xml Wed Feb 27 01:30:12
2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/protocols/protocols-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/pom.xml (original)
+++ james/server/trunk/protocols/protocols-library/pom.xml Wed Feb 27 01:30:12
2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/protocols/protocols-lmtp/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-lmtp/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-lmtp/pom.xml (original)
+++ james/server/trunk/protocols/protocols-lmtp/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/protocols/protocols-pop3/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/pom.xml (original)
+++ james/server/trunk/protocols/protocols-pop3/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/protocols/protocols-smtp/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/pom.xml (original)
+++ james/server/trunk/protocols/protocols-smtp/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/queue/queue-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue/queue-activemq/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/queue/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue/queue-activemq/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/queue/queue-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue/queue-api/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/queue/queue-api/pom.xml (original)
+++ james/server/trunk/queue/queue-api/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/queue/queue-file/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue/queue-file/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/queue/queue-file/pom.xml (original)
+++ james/server/trunk/queue/queue-file/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/queue/queue-jms/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue/queue-jms/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/queue/queue-jms/pom.xml (original)
+++ james/server/trunk/queue/queue-jms/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: james/server/trunk/spring/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/spring/pom.xml (original)
+++ james/server/trunk/spring/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified:
james/server/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
---
james/server/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
(original)
+++
james/server/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
Wed Feb 27 01:30:12 2013
@@ -22,8 +22,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:camel="http://camel.apache.org/schema/spring";
xsi:schemaLocation="
- http://www.springframework.org/schema/beans
classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd
- http://camel.apache.org/schema/spring classpath:camel-spring.xsd">
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
<!--
===========================================================================
Modified: james/server/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/util/pom.xml?rev=1450569&r1=1450568&r2=1450569&view=diff
==============================================================================
--- james/server/trunk/util/pom.xml (original)
+++ james/server/trunk/util/pom.xml Wed Feb 27 01:30:12 2013
@@ -24,7 +24,7 @@
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>3.0-beta5-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
