Brion VIBBER has submitted this change and it was merged. Change subject: Move package from org.mediawiki.api to org.mediawiki.api.json ......................................................................
Move package from org.mediawiki.api to org.mediawiki.api.json We already have an API with the previous package name and this makes packaging and deploying with maven much simpler. Change-Id: Id4a3125dfeea4b9bdee6a1b7db72ab7c6312a697 --- M pom.xml R src/main/java/org/mediawiki/api/json/Api.java R src/main/java/org/mediawiki/api/json/ApiException.java R src/main/java/org/mediawiki/api/json/RequestBuilder.java R src/main/java/org/mediawiki/api/json/package-info.java R src/test/java/org/mediawiki/api/json/ApiConstructionTest.java R src/test/java/org/mediawiki/api/json/ApiTest.java 7 files changed, 11 insertions(+), 11 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/pom.xml b/pom.xml index f5e5a13..3f1a2cc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.mediawiki</groupId> - <artifactId>api</artifactId> + <groupId>org.mediawiki.api</groupId> + <artifactId>json</artifactId> <packaging>jar</packaging> <version>1.0-SNAPSHOT</version> <name>japi</name> diff --git a/src/main/java/org/mediawiki/api/Api.java b/src/main/java/org/mediawiki/api/json/Api.java similarity index 94% rename from src/main/java/org/mediawiki/api/Api.java rename to src/main/java/org/mediawiki/api/json/Api.java index 4380e35..31844be 100644 --- a/src/main/java/org/mediawiki/api/Api.java +++ b/src/main/java/org/mediawiki/api/json/Api.java @@ -1,4 +1,4 @@ -package org.mediawiki.api; +package org.mediawiki.api.json; import com.github.kevinsawicki.http.HttpRequest; import org.json.JSONException; @@ -33,7 +33,7 @@ * Create an Api class with the default endpoint path. * * Uses https by default (isSecure is true). - * Default endpoint path is /w/api.php. + * Default endpoint path is /w/json.php. * * @param domain Domain name of the server with the wiki to connect to */ @@ -56,7 +56,7 @@ * * @param domain Domain name of the mediawiki installation to connect to * @param useSecure true to use https, false to use http - * @param endpointPath Path to the api.php file. Require preceding slash. + * @param endpointPath Path to the json.php file. Require preceding slash. */ public Api(final String domain, final boolean useSecure, final String endpointPath) { String protocol; @@ -71,7 +71,7 @@ } catch (MalformedURLException e) { // This never actually is supposed to happen, since it is thrown only // when an unknown protocal is given. http and https are guaranteed to be present, - // according to http://docs.oracle.com/javase/6/docs/api/java/net/URL.html#URL(java.lang.String, java.lang.String, int, java.lang.String) + // according to http://docs.oracle.com/javase/6/docs/json/java/net/URL.html#URL(java.lang.String, java.lang.String, int, java.lang.String) throw new RuntimeException(e); } } diff --git a/src/main/java/org/mediawiki/api/ApiException.java b/src/main/java/org/mediawiki/api/json/ApiException.java similarity index 95% rename from src/main/java/org/mediawiki/api/ApiException.java rename to src/main/java/org/mediawiki/api/json/ApiException.java index 0f4944c..ffafaa8 100644 --- a/src/main/java/org/mediawiki/api/ApiException.java +++ b/src/main/java/org/mediawiki/api/json/ApiException.java @@ -1,4 +1,4 @@ -package org.mediawiki.api; +package org.mediawiki.api.json; import org.json.JSONException; diff --git a/src/main/java/org/mediawiki/api/RequestBuilder.java b/src/main/java/org/mediawiki/api/json/RequestBuilder.java similarity index 98% rename from src/main/java/org/mediawiki/api/RequestBuilder.java rename to src/main/java/org/mediawiki/api/json/RequestBuilder.java index ab1b817..6130646 100644 --- a/src/main/java/org/mediawiki/api/RequestBuilder.java +++ b/src/main/java/org/mediawiki/api/json/RequestBuilder.java @@ -1,4 +1,4 @@ -package org.mediawiki.api; +package org.mediawiki.api.json; import org.json.JSONObject; diff --git a/src/main/java/org/mediawiki/api/package-info.java b/src/main/java/org/mediawiki/api/json/package-info.java similarity index 88% rename from src/main/java/org/mediawiki/api/package-info.java rename to src/main/java/org/mediawiki/api/json/package-info.java index 0afda44..baec768 100644 --- a/src/main/java/org/mediawiki/api/package-info.java +++ b/src/main/java/org/mediawiki/api/json/package-info.java @@ -6,4 +6,4 @@ * * @author Yuvi Panda */ -package org.mediawiki.api; \ No newline at end of file +package org.mediawiki.api.json; \ No newline at end of file diff --git a/src/test/java/org/mediawiki/api/ApiConstructionTest.java b/src/test/java/org/mediawiki/api/json/ApiConstructionTest.java similarity index 97% rename from src/test/java/org/mediawiki/api/ApiConstructionTest.java rename to src/test/java/org/mediawiki/api/json/ApiConstructionTest.java index fe29d8e..6a6a434 100644 --- a/src/test/java/org/mediawiki/api/ApiConstructionTest.java +++ b/src/test/java/org/mediawiki/api/json/ApiConstructionTest.java @@ -1,4 +1,4 @@ -package org.mediawiki.api; +package org.mediawiki.api.json; import static org.junit.Assert.*; diff --git a/src/test/java/org/mediawiki/api/ApiTest.java b/src/test/java/org/mediawiki/api/json/ApiTest.java similarity index 98% rename from src/test/java/org/mediawiki/api/ApiTest.java rename to src/test/java/org/mediawiki/api/json/ApiTest.java index f186c32..4fe8fac 100644 --- a/src/test/java/org/mediawiki/api/ApiTest.java +++ b/src/test/java/org/mediawiki/api/json/ApiTest.java @@ -1,4 +1,4 @@ -package org.mediawiki.api; +package org.mediawiki.api.json; import static org.junit.Assert.*; -- To view, visit https://gerrit.wikimedia.org/r/92603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4a3125dfeea4b9bdee6a1b7db72ab7c6312a697 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/java-mwapi Gerrit-Branch: master Gerrit-Owner: Yuvipanda <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
