diff --git a/web-sdk/dependency-reduced-pom.xml b/web-sdk/dependency-reduced-pom.xml new file mode 100644 index 0000000..13ce805 --- /dev/null +++ b/web-sdk/dependency-reduced-pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + net.irext.webapi + irext-webapi + irext-remote-index + 1.5.0 + Indexing API for IRext remote controller + + + + maven-compiler-plugin + 3.11.0 + + ${maven.compiler.source} + ${maven.compiler.target} + + + + maven-shade-plugin + 3.5.1 + + + package + + shade + + + ${project.build.directory}/${project.artifactId}-shaded.jar + + + + + + + + 1.8 + 4.12.0 + 2.10.1 + 1.8 + UTF-8 + + diff --git a/web-sdk/pom.xml b/web-sdk/pom.xml index b6ad8b0..56454eb 100644 --- a/web-sdk/pom.xml +++ b/web-sdk/pom.xml @@ -12,67 +12,56 @@ Indexing API for IRext remote controller + 1.8 + 1.8 UTF-8 - UTF-8 - 1.8 + 4.12.0 + 2.10.1 + - com.squareup.okhttp + com.squareup.okhttp3 okhttp - 2.7.5 - - - com.squareup.okio - okio - 3.4.0 + ${okhttp.version} + com.google.code.gson gson - 2.8.9 + ${gson.version} + + org.apache.maven.plugins - maven-javadoc-plugin - 3.6.3 + maven-compiler-plugin + 3.11.0 + + ${maven.compiler.source} + ${maven.compiler.target} + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.1 - attach-javadocs + package - jar + shade + + ${project.build.directory}/${project.artifactId}-shaded.jar + - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.4 - - - sign-artifacts - - sign - - - - + diff --git a/web-sdk/src/net/irext/webapi/WebAPICallbacks.java b/web-sdk/src/main/java/net/irext/webapi/WebAPICallbacks.java similarity index 100% rename from web-sdk/src/net/irext/webapi/WebAPICallbacks.java rename to web-sdk/src/main/java/net/irext/webapi/WebAPICallbacks.java diff --git a/web-sdk/src/net/irext/webapi/WebAPIs.java b/web-sdk/src/main/java/net/irext/webapi/WebAPIs.java similarity index 100% rename from web-sdk/src/net/irext/webapi/WebAPIs.java rename to web-sdk/src/main/java/net/irext/webapi/WebAPIs.java diff --git a/web-sdk/src/net/irext/webapi/bean/ACStatus.java b/web-sdk/src/main/java/net/irext/webapi/bean/ACStatus.java similarity index 100% rename from web-sdk/src/net/irext/webapi/bean/ACStatus.java rename to web-sdk/src/main/java/net/irext/webapi/bean/ACStatus.java diff --git a/web-sdk/src/net/irext/webapi/bean/TemperatureRange.java b/web-sdk/src/main/java/net/irext/webapi/bean/TemperatureRange.java similarity index 100% rename from web-sdk/src/net/irext/webapi/bean/TemperatureRange.java rename to web-sdk/src/main/java/net/irext/webapi/bean/TemperatureRange.java diff --git a/web-sdk/src/net/irext/webapi/model/ACParameters.java b/web-sdk/src/main/java/net/irext/webapi/model/ACParameters.java similarity index 100% rename from web-sdk/src/net/irext/webapi/model/ACParameters.java rename to web-sdk/src/main/java/net/irext/webapi/model/ACParameters.java diff --git a/web-sdk/src/net/irext/webapi/model/Brand.java b/web-sdk/src/main/java/net/irext/webapi/model/Brand.java similarity index 100% rename from web-sdk/src/net/irext/webapi/model/Brand.java rename to web-sdk/src/main/java/net/irext/webapi/model/Brand.java diff --git a/web-sdk/src/net/irext/webapi/model/Category.java b/web-sdk/src/main/java/net/irext/webapi/model/Category.java similarity index 100% rename from web-sdk/src/net/irext/webapi/model/Category.java rename to web-sdk/src/main/java/net/irext/webapi/model/Category.java diff --git a/web-sdk/src/net/irext/webapi/model/City.java b/web-sdk/src/main/java/net/irext/webapi/model/City.java similarity index 100% rename from web-sdk/src/net/irext/webapi/model/City.java rename to web-sdk/src/main/java/net/irext/webapi/model/City.java diff --git a/web-sdk/src/net/irext/webapi/model/RemoteIndex.java b/web-sdk/src/main/java/net/irext/webapi/model/RemoteIndex.java similarity index 100% rename from web-sdk/src/net/irext/webapi/model/RemoteIndex.java rename to web-sdk/src/main/java/net/irext/webapi/model/RemoteIndex.java diff --git a/web-sdk/src/net/irext/webapi/model/StbOperator.java b/web-sdk/src/main/java/net/irext/webapi/model/StbOperator.java similarity index 100% rename from web-sdk/src/net/irext/webapi/model/StbOperator.java rename to web-sdk/src/main/java/net/irext/webapi/model/StbOperator.java diff --git a/web-sdk/src/net/irext/webapi/model/UserApp.java b/web-sdk/src/main/java/net/irext/webapi/model/UserApp.java similarity index 100% rename from web-sdk/src/net/irext/webapi/model/UserApp.java rename to web-sdk/src/main/java/net/irext/webapi/model/UserApp.java diff --git a/web-sdk/src/net/irext/webapi/request/AppSignInRequest.java b/web-sdk/src/main/java/net/irext/webapi/request/AppSignInRequest.java similarity index 100% rename from web-sdk/src/net/irext/webapi/request/AppSignInRequest.java rename to web-sdk/src/main/java/net/irext/webapi/request/AppSignInRequest.java diff --git a/web-sdk/src/net/irext/webapi/request/BaseRequest.java b/web-sdk/src/main/java/net/irext/webapi/request/BaseRequest.java similarity index 100% rename from web-sdk/src/net/irext/webapi/request/BaseRequest.java rename to web-sdk/src/main/java/net/irext/webapi/request/BaseRequest.java diff --git a/web-sdk/src/net/irext/webapi/request/DecodeRequest.java b/web-sdk/src/main/java/net/irext/webapi/request/DecodeRequest.java similarity index 100% rename from web-sdk/src/net/irext/webapi/request/DecodeRequest.java rename to web-sdk/src/main/java/net/irext/webapi/request/DecodeRequest.java diff --git a/web-sdk/src/net/irext/webapi/request/DownloadBinaryRequest.java b/web-sdk/src/main/java/net/irext/webapi/request/DownloadBinaryRequest.java similarity index 99% rename from web-sdk/src/net/irext/webapi/request/DownloadBinaryRequest.java rename to web-sdk/src/main/java/net/irext/webapi/request/DownloadBinaryRequest.java index ee995b4..6a6d1fe 100644 --- a/web-sdk/src/net/irext/webapi/request/DownloadBinaryRequest.java +++ b/web-sdk/src/main/java/net/irext/webapi/request/DownloadBinaryRequest.java @@ -11,9 +11,7 @@ package net.irext.webapi.request; * 2017-04-14: created by strawmanbobi */ public class DownloadBinaryRequest extends BaseRequest { - private int indexId; - public DownloadBinaryRequest(int indexId) { this.indexId = indexId; } diff --git a/web-sdk/src/net/irext/webapi/request/GetACParametersRequest.java b/web-sdk/src/main/java/net/irext/webapi/request/GetACParametersRequest.java similarity index 100% rename from web-sdk/src/net/irext/webapi/request/GetACParametersRequest.java rename to web-sdk/src/main/java/net/irext/webapi/request/GetACParametersRequest.java diff --git a/web-sdk/src/net/irext/webapi/request/ListBrandsRequest.java b/web-sdk/src/main/java/net/irext/webapi/request/ListBrandsRequest.java similarity index 100% rename from web-sdk/src/net/irext/webapi/request/ListBrandsRequest.java rename to web-sdk/src/main/java/net/irext/webapi/request/ListBrandsRequest.java diff --git a/web-sdk/src/net/irext/webapi/request/ListCategoriesRequest.java b/web-sdk/src/main/java/net/irext/webapi/request/ListCategoriesRequest.java similarity index 100% rename from web-sdk/src/net/irext/webapi/request/ListCategoriesRequest.java rename to web-sdk/src/main/java/net/irext/webapi/request/ListCategoriesRequest.java diff --git a/web-sdk/src/net/irext/webapi/request/ListCitiesRequest.java b/web-sdk/src/main/java/net/irext/webapi/request/ListCitiesRequest.java similarity index 100% rename from web-sdk/src/net/irext/webapi/request/ListCitiesRequest.java rename to web-sdk/src/main/java/net/irext/webapi/request/ListCitiesRequest.java diff --git a/web-sdk/src/net/irext/webapi/request/ListIndexesRequest.java b/web-sdk/src/main/java/net/irext/webapi/request/ListIndexesRequest.java similarity index 100% rename from web-sdk/src/net/irext/webapi/request/ListIndexesRequest.java rename to web-sdk/src/main/java/net/irext/webapi/request/ListIndexesRequest.java diff --git a/web-sdk/src/net/irext/webapi/request/ListOperatorsRequest.java b/web-sdk/src/main/java/net/irext/webapi/request/ListOperatorsRequest.java similarity index 100% rename from web-sdk/src/net/irext/webapi/request/ListOperatorsRequest.java rename to web-sdk/src/main/java/net/irext/webapi/request/ListOperatorsRequest.java diff --git a/web-sdk/src/net/irext/webapi/response/ACParametersResponse.java b/web-sdk/src/main/java/net/irext/webapi/response/ACParametersResponse.java similarity index 100% rename from web-sdk/src/net/irext/webapi/response/ACParametersResponse.java rename to web-sdk/src/main/java/net/irext/webapi/response/ACParametersResponse.java diff --git a/web-sdk/src/net/irext/webapi/response/BrandsResponse.java b/web-sdk/src/main/java/net/irext/webapi/response/BrandsResponse.java similarity index 100% rename from web-sdk/src/net/irext/webapi/response/BrandsResponse.java rename to web-sdk/src/main/java/net/irext/webapi/response/BrandsResponse.java diff --git a/web-sdk/src/net/irext/webapi/response/CategoriesResponse.java b/web-sdk/src/main/java/net/irext/webapi/response/CategoriesResponse.java similarity index 100% rename from web-sdk/src/net/irext/webapi/response/CategoriesResponse.java rename to web-sdk/src/main/java/net/irext/webapi/response/CategoriesResponse.java diff --git a/web-sdk/src/net/irext/webapi/response/CitiesResponse.java b/web-sdk/src/main/java/net/irext/webapi/response/CitiesResponse.java similarity index 100% rename from web-sdk/src/net/irext/webapi/response/CitiesResponse.java rename to web-sdk/src/main/java/net/irext/webapi/response/CitiesResponse.java diff --git a/web-sdk/src/net/irext/webapi/response/DecodeResponse.java b/web-sdk/src/main/java/net/irext/webapi/response/DecodeResponse.java similarity index 100% rename from web-sdk/src/net/irext/webapi/response/DecodeResponse.java rename to web-sdk/src/main/java/net/irext/webapi/response/DecodeResponse.java diff --git a/web-sdk/src/net/irext/webapi/response/IndexesResponse.java b/web-sdk/src/main/java/net/irext/webapi/response/IndexesResponse.java similarity index 100% rename from web-sdk/src/net/irext/webapi/response/IndexesResponse.java rename to web-sdk/src/main/java/net/irext/webapi/response/IndexesResponse.java diff --git a/web-sdk/src/net/irext/webapi/response/LoginResponse.java b/web-sdk/src/main/java/net/irext/webapi/response/LoginResponse.java similarity index 100% rename from web-sdk/src/net/irext/webapi/response/LoginResponse.java rename to web-sdk/src/main/java/net/irext/webapi/response/LoginResponse.java diff --git a/web-sdk/src/net/irext/webapi/response/OperatorsResponse.java b/web-sdk/src/main/java/net/irext/webapi/response/OperatorsResponse.java similarity index 100% rename from web-sdk/src/net/irext/webapi/response/OperatorsResponse.java rename to web-sdk/src/main/java/net/irext/webapi/response/OperatorsResponse.java diff --git a/web-sdk/src/net/irext/webapi/response/ServiceResponse.java b/web-sdk/src/main/java/net/irext/webapi/response/ServiceResponse.java similarity index 100% rename from web-sdk/src/net/irext/webapi/response/ServiceResponse.java rename to web-sdk/src/main/java/net/irext/webapi/response/ServiceResponse.java diff --git a/web-sdk/src/net/irext/webapi/response/Status.java b/web-sdk/src/main/java/net/irext/webapi/response/Status.java similarity index 100% rename from web-sdk/src/net/irext/webapi/response/Status.java rename to web-sdk/src/main/java/net/irext/webapi/response/Status.java diff --git a/web-sdk/src/net/irext/webapi/utils/Constants.java b/web-sdk/src/main/java/net/irext/webapi/utils/Constants.java similarity index 100% rename from web-sdk/src/net/irext/webapi/utils/Constants.java rename to web-sdk/src/main/java/net/irext/webapi/utils/Constants.java diff --git a/web-sdk/src/net/irext/webapi/utils/MD5Digest.java b/web-sdk/src/main/java/net/irext/webapi/utils/MD5Digest.java similarity index 100% rename from web-sdk/src/net/irext/webapi/utils/MD5Digest.java rename to web-sdk/src/main/java/net/irext/webapi/utils/MD5Digest.java diff --git a/web-sdk/target/irext-webapi-1.5.0.jar b/web-sdk/target/irext-webapi-1.5.0.jar index 658a85a..5b9673a 100644 Binary files a/web-sdk/target/irext-webapi-1.5.0.jar and b/web-sdk/target/irext-webapi-1.5.0.jar differ diff --git a/web-sdk/target/irext-webapi-1.5.0.pom b/web-sdk/target/irext-webapi-1.5.0.pom deleted file mode 100644 index b6ad8b0..0000000 --- a/web-sdk/target/irext-webapi-1.5.0.pom +++ /dev/null @@ -1,78 +0,0 @@ - - - 4.0.0 - - net.irext.webapi - irext-webapi - 1.5.0 - jar - - irext-remote-index - Indexing API for IRext remote controller - - - UTF-8 - UTF-8 - 1.8 - - - - com.squareup.okhttp - okhttp - 2.7.5 - - - com.squareup.okio - okio - 3.4.0 - - - com.google.code.gson - gson - 2.8.9 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.3 - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.4 - - - sign-artifacts - - sign - - - - - - - diff --git a/web-sdk/target/irext-webapi-shaded.jar b/web-sdk/target/irext-webapi-shaded.jar new file mode 100644 index 0000000..f14f83d Binary files /dev/null and b/web-sdk/target/irext-webapi-shaded.jar differ diff --git a/web-sdk/target/javadoc-bundle-options/javadoc-options-javadoc-resources.xml b/web-sdk/target/javadoc-bundle-options/javadoc-options-javadoc-resources.xml deleted file mode 100644 index 8b89c97..0000000 --- a/web-sdk/target/javadoc-bundle-options/javadoc-options-javadoc-resources.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - src/main/javadoc - diff --git a/web-sdk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/web-sdk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..1379c1e --- /dev/null +++ b/web-sdk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,52 @@ +net/irext/webapi/bean/ACStatus.class +net/irext/webapi/WebAPICallbacks$ListProvincesCallback.class +net/irext/webapi/WebAPICallbacks$ListAreasCallback.class +net/irext/webapi/request/ListOperatorsRequest.class +net/irext/webapi/utils/Constants$ACSwing.class +net/irext/webapi/utils/Constants$BinaryType.class +net/irext/webapi/model/RemoteIndex.class +net/irext/webapi/WebAPIs.class +net/irext/webapi/model/ACParameters.class +net/irext/webapi/request/ListIndexesRequest.class +net/irext/webapi/request/ListBrandsRequest.class +net/irext/webapi/response/BrandsResponse.class +net/irext/webapi/response/OperatorsResponse.class +net/irext/webapi/utils/Constants$ACPower.class +net/irext/webapi/request/AppSignInRequest.class +net/irext/webapi/model/City.class +net/irext/webapi/response/IndexesResponse.class +net/irext/webapi/WebAPICallbacks$ListPopularBrandsCallback.class +net/irext/webapi/request/ListCategoriesRequest.class +net/irext/webapi/WebAPICallbacks.class +net/irext/webapi/WebAPICallbacks$ListPopularCitiesCallback.class +net/irext/webapi/response/DecodeResponse.class +net/irext/webapi/request/BaseRequest.class +net/irext/webapi/WebAPICallbacks$ListOperatersCallback.class +net/irext/webapi/utils/Constants$ACMode.class +net/irext/webapi/model/Category.class +net/irext/webapi/WebAPICallbacks$ListCitiesCallback.class +net/irext/webapi/WebAPICallbacks$ListCategoriesCallback.class +net/irext/webapi/bean/TemperatureRange.class +net/irext/webapi/WebAPICallbacks$ListBrandsCallback.class +net/irext/webapi/response/CategoriesResponse.class +net/irext/webapi/utils/Constants$ACWindSpeed.class +net/irext/webapi/utils/Constants$CategoryID.class +net/irext/webapi/utils/Constants$ACFunction.class +net/irext/webapi/response/ACParametersResponse.class +net/irext/webapi/request/GetACParametersRequest.class +net/irext/webapi/model/Brand.class +net/irext/webapi/WebAPICallbacks$SignInCallback.class +net/irext/webapi/response/CitiesResponse.class +net/irext/webapi/request/DownloadBinaryRequest.class +net/irext/webapi/WebAPICallbacks$ListIndexesCallback.class +net/irext/webapi/request/ListCitiesRequest.class +net/irext/webapi/response/LoginResponse.class +net/irext/webapi/request/DecodeRequest.class +net/irext/webapi/utils/Constants.class +net/irext/webapi/model/StbOperator.class +net/irext/webapi/model/UserApp.class +net/irext/webapi/utils/Constants$ACTemperature.class +net/irext/webapi/response/Status.class +net/irext/webapi/utils/MD5Digest.class +net/irext/webapi/response/ServiceResponse.class +net/irext/webapi/WebAPICallbacks$DownloadBinCallback.class diff --git a/web-sdk/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/web-sdk/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..e7b0aba --- /dev/null +++ b/web-sdk/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,33 @@ +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/ListOperatorsRequest.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/GetACParametersRequest.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/WebAPICallbacks.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/ServiceResponse.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/bean/ACStatus.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/DecodeRequest.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/CategoriesResponse.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/DownloadBinaryRequest.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/Category.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/StbOperator.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/WebAPIs.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/OperatorsResponse.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/utils/Constants.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/ACParameters.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/BrandsResponse.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/LoginResponse.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/CitiesResponse.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/Status.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/UserApp.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/RemoteIndex.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/ListIndexesRequest.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/AppSignInRequest.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/ListCategoriesRequest.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/BaseRequest.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/bean/TemperatureRange.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/City.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/DecodeResponse.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/IndexesResponse.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/Brand.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/ListBrandsRequest.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/ACParametersResponse.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/ListCitiesRequest.java +/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/utils/MD5Digest.java