You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/06/12 00:07:28 UTC
[james-project] 08/19: JAMES-3596 Move WebAdmin CLI in server/apps
folder
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a6684ae6682aae13280a87ab5389539bf45e9688
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Jun 10 14:29:56 2021 +0700
JAMES-3596 Move WebAdmin CLI in server/apps folder
---
server/{protocols => apps}/webadmin-cli/README.md | 0
server/{protocols => apps}/webadmin-cli/james-cli | 0
server/{protocols => apps}/webadmin-cli/pom.xml | 0
.../src/main/java/org/apache/james/cli/WebAdminCli.java | 0
.../org/apache/james/cli/domain/AddDomainAliasCommand.java | 0
.../java/org/apache/james/cli/domain/DomainCommand.java | 0
.../org/apache/james/cli/domain/DomainCreateCommand.java | 0
.../org/apache/james/cli/domain/DomainDeleteCommand.java | 0
.../org/apache/james/cli/domain/DomainExistCommand.java | 0
.../java/org/apache/james/cli/domain/DomainListCommand.java | 0
.../org/apache/james/cli/domain/ListDomainAliasCommand.java | 0
.../apache/james/cli/domain/RemoveDomainAliasCommand.java | 0
.../java/org/apache/james/cli/mailbox/MailboxCommand.java | 0
.../org/apache/james/cli/mailbox/MailboxCreateCommand.java | 0
.../apache/james/cli/mailbox/MailboxDeleteAllCommand.java | 0
.../org/apache/james/cli/mailbox/MailboxDeleteCommand.java | 0
.../org/apache/james/cli/mailbox/MailboxExistCommand.java | 0
.../org/apache/james/cli/mailbox/MailboxListCommand.java | 0
.../james/cli/quota/DeleteGlobalQuotaCountCommand.java | 0
.../james/cli/quota/DeleteGlobalQuotaSizeCommand.java | 0
.../apache/james/cli/quota/GetGlobalQuotaCountCommand.java | 0
.../apache/james/cli/quota/GetGlobalQuotaSizeCommand.java | 0
.../java/org/apache/james/cli/quota/GlobalQuotaCommand.java | 0
.../org/apache/james/cli/quota/GlobalQuotaCountCommand.java | 0
.../org/apache/james/cli/quota/GlobalQuotaSizeCommand.java | 0
.../main/java/org/apache/james/cli/quota/QuotaCommand.java | 0
.../apache/james/cli/quota/SetGlobalQuotaCountCommand.java | 0
.../apache/james/cli/quota/SetGlobalQuotaSizeCommand.java | 0
.../main/java/org/apache/james/cli/user/UserCommand.java | 0
.../java/org/apache/james/cli/user/UserCreateCommand.java | 0
.../java/org/apache/james/cli/user/UserDeleteCommand.java | 0
.../java/org/apache/james/cli/user/UserExistCommand.java | 0
.../java/org/apache/james/cli/user/UserListCommand.java | 0
.../main/java/org/apache/james/httpclient/Constants.java | 0
.../main/java/org/apache/james/httpclient/DomainClient.java | 0
.../org/apache/james/httpclient/FeignClientFactory.java | 0
.../src/main/java/org/apache/james/httpclient/JwtToken.java | 0
.../java/org/apache/james/httpclient/MailboxClient.java | 0
.../main/java/org/apache/james/httpclient/QuotaClient.java | 0
.../main/java/org/apache/james/httpclient/UserClient.java | 0
.../java/org/apache/james/httpclient/model/MailboxName.java | 0
.../java/org/apache/james/httpclient/model/UserName.java | 0
.../org/apache/james/httpclient/model/UserPassword.java | 0
.../test/java/org/apache/james/cli/DomainManageTest.java | 0
.../java/org/apache/james/cli/HelpVersionCommandTest.java | 0
.../src/test/java/org/apache/james/cli/JwtOptionTest.java | 0
.../test/java/org/apache/james/cli/MailboxManageTest.java | 0
.../src/test/java/org/apache/james/cli/QuotaManageTest.java | 0
.../src/test/java/org/apache/james/cli/UserManageTest.java | 0
.../webadmin-cli/src/test/resources/dnsservice.xml | 0
.../webadmin-cli/src/test/resources/domainlist.xml | 0
.../webadmin-cli/src/test/resources/imapserver.xml | 0
.../webadmin-cli/src/test/resources/jwt_publickey | 0
.../webadmin-cli/src/test/resources/keystore | Bin
.../webadmin-cli/src/test/resources/listeners.xml | 0
.../webadmin-cli/src/test/resources/lmtpserver.xml | 0
.../webadmin-cli/src/test/resources/mailetcontainer.xml | 0
.../webadmin-cli/src/test/resources/mailrepositorystore.xml | 0
.../webadmin-cli/src/test/resources/managesieveserver.xml | 0
.../webadmin-cli/src/test/resources/pop3server.xml | 0
.../webadmin-cli/src/test/resources/smtpserver.xml | 0
.../src/test/resources/valid_token_admin_false.jwt | 0
.../src/test/resources/valid_token_admin_true.jwt | 0
server/pom.xml | 2 +-
64 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/protocols/webadmin-cli/README.md b/server/apps/webadmin-cli/README.md
similarity index 100%
rename from server/protocols/webadmin-cli/README.md
rename to server/apps/webadmin-cli/README.md
diff --git a/server/protocols/webadmin-cli/james-cli b/server/apps/webadmin-cli/james-cli
similarity index 100%
rename from server/protocols/webadmin-cli/james-cli
rename to server/apps/webadmin-cli/james-cli
diff --git a/server/protocols/webadmin-cli/pom.xml b/server/apps/webadmin-cli/pom.xml
similarity index 100%
rename from server/protocols/webadmin-cli/pom.xml
rename to server/apps/webadmin-cli/pom.xml
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/WebAdminCli.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/WebAdminCli.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/WebAdminCli.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/WebAdminCli.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/AddDomainAliasCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/AddDomainAliasCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/AddDomainAliasCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/AddDomainAliasCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCreateCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCreateCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCreateCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainCreateCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainDeleteCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainExistCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainListCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainListCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainListCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/DomainListCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/ListDomainAliasCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/ListDomainAliasCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/ListDomainAliasCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/ListDomainAliasCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/RemoveDomainAliasCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/RemoveDomainAliasCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/domain/RemoveDomainAliasCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/domain/RemoveDomainAliasCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxCreateCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxCreateCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxCreateCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxCreateCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxDeleteAllCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxDeleteAllCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxDeleteAllCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxDeleteAllCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxDeleteCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxDeleteCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxDeleteCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxDeleteCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxExistCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxExistCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxExistCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxExistCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxListCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxListCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxListCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/mailbox/MailboxListCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaCountCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaCountCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaCountCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaCountCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaSizeCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaSizeCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaSizeCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/DeleteGlobalQuotaSizeCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/GetGlobalQuotaCountCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/GetGlobalQuotaCountCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/GetGlobalQuotaCountCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/GetGlobalQuotaCountCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/GetGlobalQuotaSizeCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/GetGlobalQuotaSizeCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/GetGlobalQuotaSizeCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/GetGlobalQuotaSizeCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaCountCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaCountCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaCountCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaCountCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaSizeCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaSizeCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaSizeCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/GlobalQuotaSizeCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/QuotaCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/QuotaCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/QuotaCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/QuotaCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaCountCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaCountCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaCountCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaCountCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaSizeCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaSizeCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaSizeCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/quota/SetGlobalQuotaSizeCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCreateCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCreateCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCreateCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/user/UserCreateCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserDeleteCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/user/UserDeleteCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserDeleteCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/user/UserDeleteCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserExistCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/user/UserExistCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserExistCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/user/UserExistCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserListCommand.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/cli/user/UserListCommand.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/cli/user/UserListCommand.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/cli/user/UserListCommand.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/Constants.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/Constants.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/Constants.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/Constants.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/DomainClient.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/DomainClient.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/DomainClient.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/DomainClient.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/FeignClientFactory.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/FeignClientFactory.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/FeignClientFactory.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/FeignClientFactory.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/JwtToken.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/JwtToken.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/JwtToken.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/JwtToken.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/MailboxClient.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/MailboxClient.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/MailboxClient.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/MailboxClient.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/QuotaClient.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/QuotaClient.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/QuotaClient.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/QuotaClient.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/UserClient.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/UserClient.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/UserClient.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/UserClient.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/model/MailboxName.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/model/MailboxName.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/model/MailboxName.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/model/MailboxName.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/model/UserName.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/model/UserName.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/model/UserName.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/model/UserName.java
diff --git a/server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/model/UserPassword.java b/server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/model/UserPassword.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/main/java/org/apache/james/httpclient/model/UserPassword.java
rename to server/apps/webadmin-cli/src/main/java/org/apache/james/httpclient/model/UserPassword.java
diff --git a/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/DomainManageTest.java b/server/apps/webadmin-cli/src/test/java/org/apache/james/cli/DomainManageTest.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/DomainManageTest.java
rename to server/apps/webadmin-cli/src/test/java/org/apache/james/cli/DomainManageTest.java
diff --git a/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/HelpVersionCommandTest.java b/server/apps/webadmin-cli/src/test/java/org/apache/james/cli/HelpVersionCommandTest.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/HelpVersionCommandTest.java
rename to server/apps/webadmin-cli/src/test/java/org/apache/james/cli/HelpVersionCommandTest.java
diff --git a/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/JwtOptionTest.java b/server/apps/webadmin-cli/src/test/java/org/apache/james/cli/JwtOptionTest.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/JwtOptionTest.java
rename to server/apps/webadmin-cli/src/test/java/org/apache/james/cli/JwtOptionTest.java
diff --git a/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/MailboxManageTest.java b/server/apps/webadmin-cli/src/test/java/org/apache/james/cli/MailboxManageTest.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/MailboxManageTest.java
rename to server/apps/webadmin-cli/src/test/java/org/apache/james/cli/MailboxManageTest.java
diff --git a/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/QuotaManageTest.java b/server/apps/webadmin-cli/src/test/java/org/apache/james/cli/QuotaManageTest.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/QuotaManageTest.java
rename to server/apps/webadmin-cli/src/test/java/org/apache/james/cli/QuotaManageTest.java
diff --git a/server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/UserManageTest.java b/server/apps/webadmin-cli/src/test/java/org/apache/james/cli/UserManageTest.java
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/java/org/apache/james/cli/UserManageTest.java
rename to server/apps/webadmin-cli/src/test/java/org/apache/james/cli/UserManageTest.java
diff --git a/server/protocols/webadmin-cli/src/test/resources/dnsservice.xml b/server/apps/webadmin-cli/src/test/resources/dnsservice.xml
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/dnsservice.xml
rename to server/apps/webadmin-cli/src/test/resources/dnsservice.xml
diff --git a/server/protocols/webadmin-cli/src/test/resources/domainlist.xml b/server/apps/webadmin-cli/src/test/resources/domainlist.xml
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/domainlist.xml
rename to server/apps/webadmin-cli/src/test/resources/domainlist.xml
diff --git a/server/protocols/webadmin-cli/src/test/resources/imapserver.xml b/server/apps/webadmin-cli/src/test/resources/imapserver.xml
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/imapserver.xml
rename to server/apps/webadmin-cli/src/test/resources/imapserver.xml
diff --git a/server/protocols/webadmin-cli/src/test/resources/jwt_publickey b/server/apps/webadmin-cli/src/test/resources/jwt_publickey
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/jwt_publickey
rename to server/apps/webadmin-cli/src/test/resources/jwt_publickey
diff --git a/server/protocols/webadmin-cli/src/test/resources/keystore b/server/apps/webadmin-cli/src/test/resources/keystore
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/keystore
rename to server/apps/webadmin-cli/src/test/resources/keystore
diff --git a/server/protocols/webadmin-cli/src/test/resources/listeners.xml b/server/apps/webadmin-cli/src/test/resources/listeners.xml
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/listeners.xml
rename to server/apps/webadmin-cli/src/test/resources/listeners.xml
diff --git a/server/protocols/webadmin-cli/src/test/resources/lmtpserver.xml b/server/apps/webadmin-cli/src/test/resources/lmtpserver.xml
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/lmtpserver.xml
rename to server/apps/webadmin-cli/src/test/resources/lmtpserver.xml
diff --git a/server/protocols/webadmin-cli/src/test/resources/mailetcontainer.xml b/server/apps/webadmin-cli/src/test/resources/mailetcontainer.xml
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/mailetcontainer.xml
rename to server/apps/webadmin-cli/src/test/resources/mailetcontainer.xml
diff --git a/server/protocols/webadmin-cli/src/test/resources/mailrepositorystore.xml b/server/apps/webadmin-cli/src/test/resources/mailrepositorystore.xml
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/mailrepositorystore.xml
rename to server/apps/webadmin-cli/src/test/resources/mailrepositorystore.xml
diff --git a/server/protocols/webadmin-cli/src/test/resources/managesieveserver.xml b/server/apps/webadmin-cli/src/test/resources/managesieveserver.xml
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/managesieveserver.xml
rename to server/apps/webadmin-cli/src/test/resources/managesieveserver.xml
diff --git a/server/protocols/webadmin-cli/src/test/resources/pop3server.xml b/server/apps/webadmin-cli/src/test/resources/pop3server.xml
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/pop3server.xml
rename to server/apps/webadmin-cli/src/test/resources/pop3server.xml
diff --git a/server/protocols/webadmin-cli/src/test/resources/smtpserver.xml b/server/apps/webadmin-cli/src/test/resources/smtpserver.xml
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/smtpserver.xml
rename to server/apps/webadmin-cli/src/test/resources/smtpserver.xml
diff --git a/server/protocols/webadmin-cli/src/test/resources/valid_token_admin_false.jwt b/server/apps/webadmin-cli/src/test/resources/valid_token_admin_false.jwt
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/valid_token_admin_false.jwt
rename to server/apps/webadmin-cli/src/test/resources/valid_token_admin_false.jwt
diff --git a/server/protocols/webadmin-cli/src/test/resources/valid_token_admin_true.jwt b/server/apps/webadmin-cli/src/test/resources/valid_token_admin_true.jwt
similarity index 100%
rename from server/protocols/webadmin-cli/src/test/resources/valid_token_admin_true.jwt
rename to server/apps/webadmin-cli/src/test/resources/valid_token_admin_true.jwt
diff --git a/server/pom.xml b/server/pom.xml
index caff948..2f8e4f0 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -44,6 +44,7 @@
<module>apps/cli-integration-tests</module>
<module>apps/distributed-app</module>
<module>apps/spring-app</module>
+ <module>apps/webadmin-cli</module>
<module>blob</module>
@@ -99,7 +100,6 @@
<module>protocols/protocols-pop3</module>
<module>protocols/protocols-smtp</module>
<module>protocols/webadmin</module>
- <module>protocols/webadmin-cli</module>
<module>protocols/webadmin-integration-test</module>
<module>queue/queue-activemq</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org