Package change "org.nlpcraft" -> "org.apache.nlpcraft".
diff --git a/docs/_config.yml b/docs/_config.yml
index a980707..711aef3 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -16,7 +16,6 @@
#
title: Apache NLPCraft
-email: info@nlpcraft.org
copyright: Copyright (C) 2020 Apache Software Foundation.
baseurl: ""
url: ""
diff --git a/pom.xml b/pom.xml
index bf1c22c..fa682be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.nlpcraft</groupId>
- <artifactId>nlpcraft-java-client</artifactId>
- <version>0.4.0</version>
+ <artifactId>java-client</artifactId>
+ <version>0.5.0</version>
<dependencies>
<dependency>
@@ -58,6 +58,14 @@
<artifactId>log4j-core</artifactId>
<version>${log4j.ver}</version>
</dependency>
+ <!--
+ //
+ // TODO:
+ // These import statements need to be fixed once
+ // the main project is migrated over ASF and released on maven.
+ // For now - they are pulling/relying on "old" 'org.nlpcraft' artifact.
+ //
+ -->
<dependency>
<groupId>org.nlpcraft</groupId>
<artifactId>nlpcraft</artifactId>
@@ -131,7 +139,11 @@
<stylesheetfile>${project.basedir}/javadoc/stylesheet.css</stylesheetfile>
<bottom>
<![CDATA[
- Copyright © {currentYear} NLPCraft Project. All rights reserved.
+ <br/>
+ Copyright © {currentYear} Apache Software Foundation
+ <br/>
+ <br/>
+ <img src="https://www.apache.org/img/ASF20thAnniversary.jpg" height="64px">
]]>
</bottom>
<top>
@@ -146,30 +158,30 @@
<script async defer src="https://buttons.github.io/buttons.js"></script>
]]>
</top>
- <subpackages>org.nlpcraft.client</subpackages>
+ <subpackages>org.apache.nlpcraft.client</subpackages>
<excludePackageNames>
- org.nlpcraft.client.impl
+ org.apache.nlpcraft.client.impl
</excludePackageNames>
<groups>
<group>
- <title>NLPCraft Java Client</title>
+ <title>Apache NLPCraft - Java Client</title>
<packages>
- org.nlpcraft.client
+ org.apache.nlpcraft.client
</packages>
</group>
</groups>
<header>
<![CDATA[
- NLPCraft Java Client ${project.version}
+ Apache NLPCraft - Java Client ${project.version}
]]>
</header>
<footer>
<![CDATA[
- <span style="vertical-align: super">NLPCraft Java Client ${project.version}</span>
- <a style="vertical-align: super; margin-right: 10px" href="https://github.com/nlpcrafters/nlpcraft-java-client " target="github"><i class="fa fa-github github-logo"></i></a>
- <a class="github-button" href="https://github.com/nlpcrafters/nlpcraft-java-client/subscription" data-icon="octicon-eye" aria-label="Watch nlpcrafters/nlpcraft-java-client on GitHub">Watch</a>
- <a class="github-button" href="https://github.com/nlpcrafters/nlpcraft-java-client" data-icon="octicon-star" aria-label="Star nlpcrafters/nlpcraft-java-client on GitHub">Star</a>
- <a class="github-button" href="https://github.com/nlpcrafters/nlpcraft-java-client/fork" data-icon="octicon-repo-forked" aria-label="Fork nlpcrafters/nlpcraft-java-client on GitHub">Fork</a>
+ <span style="vertical-align: super">Apache NLPCraft - Java Client ${project.version}</span>
+ <a style="vertical-align: super; margin-right: 10px" href="https://github.com/apache/incubator-nlpcraft-java-client" target="github"><i class="fa fa-github github-logo"></i></a>
+ <a class="github-button" href="https://github.com/apache/incubator-nlpcraft-java-client/subscription" data-icon="octicon-eye" aria-label="Watch on GitHub">Watch</a>
+ <a class="github-button" href="https://github.com/apache/incubator-nlpcraft-java-client" data-icon="octicon-star" aria-label="Star on GitHub">Star</a>
+ <a class="github-button" href="https://github.com/apache/incubator-nlpcraft-java-client/fork" data-icon="octicon-repo-forked" aria-label="Fork on GitHub">Fork</a>
<script type="text/javascript">
SyntaxHighlighter.defaults["auto-links"] = false;
SyntaxHighlighter.defaults["tab-size"] = 2;
@@ -190,11 +202,10 @@
</footer>
<doctitle>
<![CDATA[
- <img style="margin-bottom: 10px" src="https://nlpcraft.org/images/nlpcraft_logo_darkblue.png" height="54px"><br>
- NLPCraft Java Client API ${project.version}
+ Apache NLPCraft - Java Client API ${project.version}
]]>
</doctitle>
- <windowtitle>NLPCraft Java Client ${project.version}</windowtitle>
+ <windowtitle>Apache NLPCraft - Java Client ${project.version}</windowtitle>
<show>public</show>
<verbose>false</verbose>
</configuration>
diff --git a/src/main/java/org/nlpcraft/client/NCClient.java b/src/main/java/org/apache/nlpcraft/client/NCClient.java
similarity index 99%
rename from src/main/java/org/nlpcraft/client/NCClient.java
rename to src/main/java/org/apache/nlpcraft/client/NCClient.java
index 6bbb856..dc056b3 100644
--- a/src/main/java/org/nlpcraft/client/NCClient.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCClient.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import java.io.*;
import java.util.*;
diff --git a/src/main/java/org/nlpcraft/client/NCClientBuilder.java b/src/main/java/org/apache/nlpcraft/client/NCClientBuilder.java
similarity index 98%
rename from src/main/java/org/nlpcraft/client/NCClientBuilder.java
rename to src/main/java/org/apache/nlpcraft/client/NCClientBuilder.java
index cb40ab9..b004425 100644
--- a/src/main/java/org/nlpcraft/client/NCClientBuilder.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCClientBuilder.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
-import org.nlpcraft.client.impl.NCClientImpl;
+import org.apache.nlpcraft.client.impl.NCClientImpl;
import java.io.IOException;
import java.util.function.Supplier;
diff --git a/src/main/java/org/nlpcraft/client/NCClientException.java b/src/main/java/org/apache/nlpcraft/client/NCClientException.java
similarity index 85%
rename from src/main/java/org/nlpcraft/client/NCClientException.java
rename to src/main/java/org/apache/nlpcraft/client/NCClientException.java
index 25663d6..954465e 100644
--- a/src/main/java/org/nlpcraft/client/NCClientException.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCClientException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
/**
* Java client exception.
@@ -36,8 +36,7 @@
* Creates new exception with given error message and server error code.
*
* @param msg Error message.
- * @param code REST server error code. See <a href="https://github.com/nlpcrafters/nlpcraft/blob/master/openapi/nlpcraft_swagger.yml" target=_>openapi/nlpcraft_swagger.yml</a> file for
- * details.
+ * @param code REST server error code.
*/
public NCClientException(String msg, String code) {
super(msg);
@@ -70,7 +69,7 @@
* <li>NC_ERROR</li>
* <li>NC_UNEXPECTED_ERROR</li></li>
* </ul>
- * See <a href="https://github.com/nlpcrafters/nlpcraft/blob/master/openapi/nlpcraft_swagger.yml" target=_>openapi/nlpcraft_swagger.yml</a> file for
+ * See <a href="https://github.com/apache/incubator-nlpcraft/blob/master/openapi/nlpcraft_swagger.yml" target=_>openapi/nlpcraft_swagger.yml</a> file for
* details.
*/
public String getServerCode() {
diff --git a/src/main/java/org/nlpcraft/client/NCCompany.java b/src/main/java/org/apache/nlpcraft/client/NCCompany.java
similarity index 98%
rename from src/main/java/org/nlpcraft/client/NCCompany.java
rename to src/main/java/org/apache/nlpcraft/client/NCCompany.java
index 58bbb2e..8202cba 100644
--- a/src/main/java/org/nlpcraft/client/NCCompany.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCCompany.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
/**
* Company descriptor.
diff --git a/src/main/java/org/nlpcraft/client/NCFeedback.java b/src/main/java/org/apache/nlpcraft/client/NCFeedback.java
similarity index 97%
rename from src/main/java/org/nlpcraft/client/NCFeedback.java
rename to src/main/java/org/apache/nlpcraft/client/NCFeedback.java
index bc89b28..c2d03f5 100644
--- a/src/main/java/org/nlpcraft/client/NCFeedback.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCFeedback.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
/**
* Feedback record descriptor.
diff --git a/src/main/java/org/nlpcraft/client/NCModel.java b/src/main/java/org/apache/nlpcraft/client/NCModel.java
similarity index 97%
rename from src/main/java/org/nlpcraft/client/NCModel.java
rename to src/main/java/org/apache/nlpcraft/client/NCModel.java
index f96a58a..4712df8 100644
--- a/src/main/java/org/nlpcraft/client/NCModel.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCModel.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
/**
* Data model descriptor.
diff --git a/src/main/java/org/nlpcraft/client/NCNewCompany.java b/src/main/java/org/apache/nlpcraft/client/NCNewCompany.java
similarity index 97%
rename from src/main/java/org/nlpcraft/client/NCNewCompany.java
rename to src/main/java/org/apache/nlpcraft/client/NCNewCompany.java
index 74defa0..cdee41e 100644
--- a/src/main/java/org/nlpcraft/client/NCNewCompany.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCNewCompany.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
/**
* New company descriptor.
diff --git a/src/main/java/org/nlpcraft/client/NCProbe.java b/src/main/java/org/apache/nlpcraft/client/NCProbe.java
similarity index 98%
rename from src/main/java/org/nlpcraft/client/NCProbe.java
rename to src/main/java/org/apache/nlpcraft/client/NCProbe.java
index 8ac544e..b728bf8 100644
--- a/src/main/java/org/nlpcraft/client/NCProbe.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCProbe.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import java.util.Set;
diff --git a/src/main/java/org/nlpcraft/client/NCResult.java b/src/main/java/org/apache/nlpcraft/client/NCResult.java
similarity index 94%
rename from src/main/java/org/nlpcraft/client/NCResult.java
rename to src/main/java/org/apache/nlpcraft/client/NCResult.java
index 357ef32..278fd4f 100644
--- a/src/main/java/org/nlpcraft/client/NCResult.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import java.util.*;
@@ -89,7 +89,7 @@
/**
* Gets optional error code. See <code>/check</code> operation in
- * <a href="https://github.com/nlpcrafters/nlpcraft/blob/master/openapi/nlpcraft_swagger.yml" target=_>openapi/nlpcraft_swagger.yml</a> file
+ * <a href="https://github.com/apache/incubator-nlpcraft/blob/master/openapi/nlpcraft_swagger.yml" target=_>openapi/nlpcraft_swagger.yml</a> file
* for more details. Note that error code and error message are only present if query result is unsuccessful.
*
* @return Optional error code. Can be {@code null}.
diff --git a/src/main/java/org/nlpcraft/client/NCUser.java b/src/main/java/org/apache/nlpcraft/client/NCUser.java
similarity index 97%
rename from src/main/java/org/nlpcraft/client/NCUser.java
rename to src/main/java/org/apache/nlpcraft/client/NCUser.java
index 9deb8a2..9ee6549 100644
--- a/src/main/java/org/nlpcraft/client/NCUser.java
+++ b/src/main/java/org/apache/nlpcraft/client/NCUser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import java.util.Map;
diff --git a/src/main/java/org/nlpcraft/client/impl/NCClientImpl.java b/src/main/java/org/apache/nlpcraft/client/impl/NCClientImpl.java
similarity index 94%
rename from src/main/java/org/nlpcraft/client/impl/NCClientImpl.java
rename to src/main/java/org/apache/nlpcraft/client/impl/NCClientImpl.java
index 0b73901..9d967ad 100644
--- a/src/main/java/org/nlpcraft/client/impl/NCClientImpl.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/NCClientImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl;
+package org.apache.nlpcraft.client.impl;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -32,30 +32,37 @@
import org.apache.http.util.EntityUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.nlpcraft.client.NCClient;
-import org.nlpcraft.client.NCClientException;
-import org.nlpcraft.client.NCCompany;
-import org.nlpcraft.client.NCFeedback;
-import org.nlpcraft.client.NCNewCompany;
-import org.nlpcraft.client.NCProbe;
-import org.nlpcraft.client.NCResult;
-import org.nlpcraft.client.NCUser;
-import org.nlpcraft.client.impl.beans.NCAskBean;
-import org.nlpcraft.client.impl.beans.NCAskSyncBean;
-import org.nlpcraft.client.impl.beans.NCCheckBean;
-import org.nlpcraft.client.impl.beans.NCCompanyBean;
-import org.nlpcraft.client.impl.beans.NCCompanyTokenResetBean;
-import org.nlpcraft.client.impl.beans.NCErrorMessageBean;
-import org.nlpcraft.client.impl.beans.NCFeedbackAddBean;
-import org.nlpcraft.client.impl.beans.NCFeedbackAllBean;
-import org.nlpcraft.client.impl.beans.NCProbesAllBean;
-import org.nlpcraft.client.impl.beans.NCRequestStateBean;
-import org.nlpcraft.client.impl.beans.NCSigninBean;
-import org.nlpcraft.client.impl.beans.NCStatusResponseBean;
-import org.nlpcraft.client.impl.beans.NCTokenCreationBean;
-import org.nlpcraft.client.impl.beans.NCUserAddBean;
-import org.nlpcraft.client.impl.beans.NCUserBean;
-import org.nlpcraft.client.impl.beans.NCUsersAllBean;
+import org.apache.nlpcraft.client.NCClient;
+import org.apache.nlpcraft.client.NCClientException;
+import org.apache.nlpcraft.client.NCCompany;
+import org.apache.nlpcraft.client.NCFeedback;
+import org.apache.nlpcraft.client.NCNewCompany;
+import org.apache.nlpcraft.client.NCProbe;
+import org.apache.nlpcraft.client.NCResult;
+import org.apache.nlpcraft.client.NCUser;
+import org.apache.nlpcraft.client.impl.beans.NCAskBean;
+import org.apache.nlpcraft.client.impl.beans.NCAskSyncBean;
+import org.apache.nlpcraft.client.impl.beans.NCCheckBean;
+import org.apache.nlpcraft.client.impl.beans.NCCompanyBean;
+import org.apache.nlpcraft.client.impl.beans.NCCompanyTokenResetBean;
+import org.apache.nlpcraft.client.impl.beans.NCErrorMessageBean;
+import org.apache.nlpcraft.client.impl.beans.NCFeedbackAddBean;
+import org.apache.nlpcraft.client.impl.beans.NCFeedbackAllBean;
+import org.apache.nlpcraft.client.impl.beans.NCProbesAllBean;
+import org.apache.nlpcraft.client.impl.beans.NCRequestStateBean;
+import org.apache.nlpcraft.client.impl.beans.NCSigninBean;
+import org.apache.nlpcraft.client.impl.beans.NCStatusResponseBean;
+import org.apache.nlpcraft.client.impl.beans.NCTokenCreationBean;
+import org.apache.nlpcraft.client.impl.beans.NCUserAddBean;
+import org.apache.nlpcraft.client.impl.beans.NCUserBean;
+import org.apache.nlpcraft.client.impl.beans.NCUsersAllBean;
+
+//
+// TODO:
+// These import statements need to be fixed once
+// the main project is migrated over ASF and released on maven.
+// For now - they are pulling/relying on "old" 'org.nlpcraft' artifact.
+//
import org.nlpcraft.probe.embedded.NCEmbeddedProbe;
import org.nlpcraft.probe.embedded.NCEmbeddedResult;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCAskBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCAskBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskBean.java
index 3e1b782..774a781 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCAskBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.*;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCAskSyncBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskSyncBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCAskSyncBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskSyncBean.java
index 2368417..53c436b 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCAskSyncBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCAskSyncBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCCheckBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCheckBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCCheckBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCCheckBean.java
index b1c5961..40828d5 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCCheckBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCheckBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCCompanyBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCCompanyBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyBean.java
index a3b22cd..287428b 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCCompanyBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyBean.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
-import org.nlpcraft.client.NCCompany;
+import org.apache.nlpcraft.client.NCCompany;
/**
* REST bean.
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java
index 835136e..db419f7 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCCompanyTokenResetBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCErrorMessageBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCErrorMessageBean.java
similarity index 96%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCErrorMessageBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCErrorMessageBean.java
index 3af8e40..05cc30d 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCErrorMessageBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCErrorMessageBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCFeedbackAddBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAddBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCFeedbackAddBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAddBean.java
index d4acb2c..b55f0d6 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCFeedbackAddBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAddBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCFeedbackAllBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAllBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCFeedbackAllBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAllBean.java
index 5766cf3..8464432 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCFeedbackAllBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackAllBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCFeedbackBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCFeedbackBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackBean.java
index 78e46e1..c40b2a4 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCFeedbackBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCFeedbackBean.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
-import org.nlpcraft.client.NCFeedback;
+import org.apache.nlpcraft.client.NCFeedback;
/**
* REST bean.
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCModelBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelBean.java
similarity index 93%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCModelBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelBean.java
index 3177f7e..fa6a293 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCModelBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCModelBean.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
-import org.nlpcraft.client.NCModel;
+import org.apache.nlpcraft.client.NCModel;
/**
* REST bean.
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCProbeBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbeBean.java
similarity index 96%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCProbeBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbeBean.java
index 401cb2b..635a03c 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCProbeBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbeBean.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
-import org.nlpcraft.client.NCModel;
-import org.nlpcraft.client.NCProbe;
+import org.apache.nlpcraft.client.NCModel;
+import org.apache.nlpcraft.client.NCProbe;
import java.util.HashSet;
import java.util.Set;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCProbesAllBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbesAllBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCProbesAllBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbesAllBean.java
index 51a4b52..9434003 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCProbesAllBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCProbesAllBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCRequestStateBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCRequestStateBean.java
similarity index 96%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCRequestStateBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCRequestStateBean.java
index 180a9f3..544e390 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCRequestStateBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCRequestStateBean.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
-import org.nlpcraft.client.NCResult;
+import org.apache.nlpcraft.client.NCResult;
/**
* REST bean.
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCSigninBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSigninBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCSigninBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCSigninBean.java
index 67c537c..1e69237 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCSigninBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCSigninBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCStatusResponseBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCStatusResponseBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCStatusResponseBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCStatusResponseBean.java
index 96f2c38..4a101e9 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCStatusResponseBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCStatusResponseBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCTokenCreationBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCTokenCreationBean.java
similarity index 92%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCTokenCreationBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCTokenCreationBean.java
index 6ce7f12..65aa440 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCTokenCreationBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCTokenCreationBean.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
-import org.nlpcraft.client.NCNewCompany;
+import org.apache.nlpcraft.client.NCNewCompany;
/**
* REST bean.
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCUserAddBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserAddBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCUserAddBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserAddBean.java
index 9a80ea3..0077791 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCUserAddBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserAddBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCUserBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCUserBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserBean.java
index 96df131..84cad39 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCUserBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUserBean.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
-import org.nlpcraft.client.NCUser;
+import org.apache.nlpcraft.client.NCUser;
import java.util.Map;
diff --git a/src/main/java/org/nlpcraft/client/impl/beans/NCUsersAllBean.java b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUsersAllBean.java
similarity index 95%
rename from src/main/java/org/nlpcraft/client/impl/beans/NCUsersAllBean.java
rename to src/main/java/org/apache/nlpcraft/client/impl/beans/NCUsersAllBean.java
index 0970f3e..c35bac1 100644
--- a/src/main/java/org/nlpcraft/client/impl/beans/NCUsersAllBean.java
+++ b/src/main/java/org/apache/nlpcraft/client/impl/beans/NCUsersAllBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client.impl.beans;
+package org.apache.nlpcraft.client.impl.beans;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/org/nlpcraft/client/package-info.java b/src/main/java/org/apache/nlpcraft/client/package-info.java
similarity index 96%
rename from src/main/java/org/nlpcraft/client/package-info.java
rename to src/main/java/org/apache/nlpcraft/client/package-info.java
index cfad687..75d0cb2 100644
--- a/src/main/java/org/nlpcraft/client/package-info.java
+++ b/src/main/java/org/apache/nlpcraft/client/package-info.java
@@ -20,4 +20,4 @@
* <a target=_ href="https://nlpcraft.org/using-rest.html">REST APIs</a> for any JVM-based languages
* like Java, Scala, Kotlin or Groovy.
*/
-package org.nlpcraft.client;
\ No newline at end of file
+package org.apache.nlpcraft.client;
\ No newline at end of file
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 989375e..b3aa2e2 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -27,7 +27,7 @@
<Root level="DEBUG">
<AppenderRef ref="CONSOLE"/>
</Root>
- <Logger name="org.nlpcraft" level="DEBUG" additivity="false">
+ <Logger name="org.apache.nlpcraft" level="DEBUG" additivity="false">
<AppenderRef ref="CONSOLE"/>
</Logger>
</Loggers>
diff --git a/src/test/java/org/nlpcraft/client/NCAskSyncTest.java b/src/test/java/org/apache/nlpcraft/client/NCAskSyncTest.java
similarity index 98%
rename from src/test/java/org/nlpcraft/client/NCAskSyncTest.java
rename to src/test/java/org/apache/nlpcraft/client/NCAskSyncTest.java
index 8b63533..4bcc2f4 100644
--- a/src/test/java/org/nlpcraft/client/NCAskSyncTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCAskSyncTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/nlpcraft/client/NCAskTest.java b/src/test/java/org/apache/nlpcraft/client/NCAskTest.java
similarity index 98%
rename from src/test/java/org/nlpcraft/client/NCAskTest.java
rename to src/test/java/org/apache/nlpcraft/client/NCAskTest.java
index d888265..6f362d5 100644
--- a/src/test/java/org/nlpcraft/client/NCAskTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCAskTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/nlpcraft/client/NCBuilderTest.java b/src/test/java/org/apache/nlpcraft/client/NCBuilderTest.java
similarity index 97%
rename from src/test/java/org/nlpcraft/client/NCBuilderTest.java
rename to src/test/java/org/apache/nlpcraft/client/NCBuilderTest.java
index f5cd7dc..5c36340 100644
--- a/src/test/java/org/nlpcraft/client/NCBuilderTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCBuilderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/nlpcraft/client/NCCompanyTest.java b/src/test/java/org/apache/nlpcraft/client/NCCompanyTest.java
similarity index 98%
rename from src/test/java/org/nlpcraft/client/NCCompanyTest.java
rename to src/test/java/org/apache/nlpcraft/client/NCCompanyTest.java
index 2ec0907..603b69b 100644
--- a/src/test/java/org/nlpcraft/client/NCCompanyTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCCompanyTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/nlpcraft/client/NCConversationTest.java b/src/test/java/org/apache/nlpcraft/client/NCConversationTest.java
similarity index 98%
rename from src/test/java/org/nlpcraft/client/NCConversationTest.java
rename to src/test/java/org/apache/nlpcraft/client/NCConversationTest.java
index 4fa7999..36129ba 100644
--- a/src/test/java/org/nlpcraft/client/NCConversationTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCConversationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/nlpcraft/client/NCFeedbackTest.java b/src/test/java/org/apache/nlpcraft/client/NCFeedbackTest.java
similarity index 98%
rename from src/test/java/org/nlpcraft/client/NCFeedbackTest.java
rename to src/test/java/org/apache/nlpcraft/client/NCFeedbackTest.java
index 5560e09..43829fd 100644
--- a/src/test/java/org/nlpcraft/client/NCFeedbackTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCFeedbackTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/nlpcraft/client/NCMultiClientsTest.java b/src/test/java/org/apache/nlpcraft/client/NCMultiClientsTest.java
similarity index 98%
rename from src/test/java/org/nlpcraft/client/NCMultiClientsTest.java
rename to src/test/java/org/apache/nlpcraft/client/NCMultiClientsTest.java
index a073001..4b583e0 100644
--- a/src/test/java/org/nlpcraft/client/NCMultiClientsTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCMultiClientsTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.apache.http.client.config.RequestConfig;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/nlpcraft/client/NCPermissionsTest.java b/src/test/java/org/apache/nlpcraft/client/NCPermissionsTest.java
similarity index 98%
rename from src/test/java/org/nlpcraft/client/NCPermissionsTest.java
rename to src/test/java/org/apache/nlpcraft/client/NCPermissionsTest.java
index ab32e4b..a65b861 100644
--- a/src/test/java/org/nlpcraft/client/NCPermissionsTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCPermissionsTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/nlpcraft/client/NCProbesTest.java b/src/test/java/org/apache/nlpcraft/client/NCProbesTest.java
similarity index 96%
rename from src/test/java/org/nlpcraft/client/NCProbesTest.java
rename to src/test/java/org/apache/nlpcraft/client/NCProbesTest.java
index 2aa45cb..d574f08 100644
--- a/src/test/java/org/nlpcraft/client/NCProbesTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCProbesTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/nlpcraft/client/NCTestAdapter.java b/src/test/java/org/apache/nlpcraft/client/NCTestAdapter.java
similarity index 98%
rename from src/test/java/org/nlpcraft/client/NCTestAdapter.java
rename to src/test/java/org/apache/nlpcraft/client/NCTestAdapter.java
index 02e3c37..fc32254 100644
--- a/src/test/java/org/nlpcraft/client/NCTestAdapter.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCTestAdapter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/nlpcraft/client/NCUserTest.java b/src/test/java/org/apache/nlpcraft/client/NCUserTest.java
similarity index 98%
rename from src/test/java/org/nlpcraft/client/NCUserTest.java
rename to src/test/java/org/apache/nlpcraft/client/NCUserTest.java
index 8f3240c..b09e6cd 100644
--- a/src/test/java/org/nlpcraft/client/NCUserTest.java
+++ b/src/test/java/org/apache/nlpcraft/client/NCUserTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.nlpcraft.client;
+package org.apache.nlpcraft.client;
import org.junit.jupiter.api.Test;
@@ -211,7 +211,7 @@
null,
true,
null,
- "unexisted external ID"
+ "non-existed external ID"
),
"NC_ERROR"
);
diff --git a/src/test/java/org/nlpcraft/client/NCDialogTest.java b/src/test/java/org/nlpcraft/client/NCDialogTest.java
deleted file mode 100644
index 6f7d1f3..0000000
--- a/src/test/java/org/nlpcraft/client/NCDialogTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.nlpcraft.client;
-
-/**
- * REST client test. Methods `clear/dialog`.
- */
-class NCDialogTest extends NCTestAdapter {
- //
- private static final String MDL_ID = "nlpcraft.weather.ex";
-
- // TODO: implement.
-}
