JAMES-2139 DataProbe support domain mapping
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bdedd0bf Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bdedd0bf Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bdedd0bf Branch: refs/heads/master Commit: bdedd0bfe45a81d93a69cb60ea62d1ea0de328eb Parents: 1b4d923 Author: quynhn <[email protected]> Authored: Thu Sep 7 11:21:44 2017 +0700 Committer: Antoine Duprat <[email protected]> Committed: Wed Sep 13 10:23:33 2017 +0200 ---------------------------------------------------------------------- .../james/cli/probe/impl/JmxDataProbe.java | 47 ++++++++++++-------- .../org/apache/james/utils/DataProbeImpl.java | 4 ++ .../java/org/apache/james/probe/DataProbe.java | 2 + 3 files changed, 35 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/bdedd0bf/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java index 3c70b24..debcef9 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java @@ -35,9 +35,10 @@ import org.apache.james.util.MDCBuilder; public class JmxDataProbe implements DataProbe, JmxProbe { - 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 static final String DOMAINLIST_OBJECT_NAME = "org.apache.james:type=component,name=domainlist"; + private static final String VIRTUALUSERTABLE_OBJECT_NAME = "org.apache.james:type=component,name=recipientrewritetable"; + private static final String USERSREPOSITORY_OBJECT_NAME = "org.apache.james:type=component,name=usersrepository"; + private static final String JMX = "JMX"; private DomainListManagementMBean domainListProxy; private RecipientRewriteTableManagementMBean virtualUserTableProxy; @@ -58,7 +59,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public void addUser(String userName, String password) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "addUser") .addContext("parameter", userName) .build()) { @@ -70,7 +71,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public void removeUser(String username) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "removeUser") .addContext("parameter", username) .build()) { @@ -82,7 +83,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public String[] listUsers() throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "listUsers") .build()) { return usersRepositoryProxy.listAllUsers(); @@ -93,7 +94,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public void setPassword(String userName, String password) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "setPassword") .addContext("parameter", userName) .build()) { @@ -105,7 +106,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public boolean containsDomain(String domain) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "containsDomain") .addContext("parameter", domain) .build()) { @@ -117,7 +118,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public String getDefaultDomain() throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "getDefaultDomain") .build()) { return domainListProxy.getDefaultDomain(); @@ -128,7 +129,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public void addDomain(String domain) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "addDomain") .addContext("parameter", domain) .build()) { @@ -140,7 +141,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public void removeDomain(String domain) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "removeDomain") .addContext("parameter", domain) .build()) { @@ -152,7 +153,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public List<String> listDomains() throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "listDomains") .build()) { return domainListProxy.getDomains(); @@ -163,7 +164,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public Map<String, Mappings> listMappings() throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "listMappings") .build()) { return virtualUserTableProxy.getAllMappings(); @@ -174,7 +175,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public void addAddressMapping(String user, String domain, String toAddress) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "addAddressMapping") .build()) { virtualUserTableProxy.addAddressMapping(user, domain, toAddress); @@ -185,7 +186,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public void removeAddressMapping(String user, String domain, String fromAddress) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "removeAddressMapping") .build()) { virtualUserTableProxy.removeAddressMapping(user, domain, fromAddress); @@ -196,7 +197,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public Mappings listUserDomainMappings(String user, String domain) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "listUserDomainMappings") .build()) { return virtualUserTableProxy.getUserDomainMappings(user, domain); @@ -207,7 +208,7 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public void addRegexMapping(String user, String domain, String regex) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "addRegexMapping") .build()) { virtualUserTableProxy.addRegexMapping(user, domain, regex); @@ -218,11 +219,21 @@ public class JmxDataProbe implements DataProbe, JmxProbe { public void removeRegexMapping(String user, String domain, String regex) throws Exception { try (Closeable closeable = MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, "CLI") + .addContext(MDCBuilder.PROTOCOL, JMX) .addContext(MDCBuilder.ACTION, "removeRegexMapping") .build()) { virtualUserTableProxy.removeRegexMapping(user, domain, regex); } } + @Override + public void addDomainAliasMapping(String aliasDomain, String deliveryDomain) throws Exception { + try (Closeable closeable = + MDCBuilder.create() + .addContext(MDCBuilder.PROTOCOL, JMX) + .addContext(MDCBuilder.ACTION, "addDomainAliasMapping") + .build()) { + virtualUserTableProxy.addDomainMapping(aliasDomain, deliveryDomain); + } + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/bdedd0bf/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java index 8fdfccf..ed4d522 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java @@ -127,4 +127,8 @@ public class DataProbeImpl implements GuiceProbe, DataProbe { recipientRewriteTable.removeRegexMapping(user, domain, regex); } + @Override + public void addDomainAliasMapping(String aliasDomain, String deliveryDomain) throws Exception { + recipientRewriteTable.addAliasDomainMapping(aliasDomain, deliveryDomain); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/bdedd0bf/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java b/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java index 6f45e61..31488d7 100644 --- a/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java +++ b/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java @@ -56,4 +56,6 @@ public interface DataProbe { void removeRegexMapping(String user, String domain, String regex) throws Exception; + void addDomainAliasMapping(String aliasDomain, String deliveryDomain) throws Exception; + } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
