diff --git a/maxkey-client-sdk/src/main/java/MANIFEST.MF b/maxkey-client-sdk/src/main/java/MANIFEST.MF deleted file mode 100644 index 254272e1c..000000000 --- a/maxkey-client-sdk/src/main/java/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/maxkey-client-sdk/src/main/java/META-INF/MANIFEST.MF b/maxkey-client-sdk/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 59499bce4..000000000 --- a/maxkey-client-sdk/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/Package.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/Package.java deleted file mode 100644 index ae8fc8ed0..000000000 --- a/maxkey-client-sdk/src/main/java/org/maxkey/client/Package.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.maxkey.client; - -public class Package { - -} diff --git a/maxkey-client-sdk/src/main/java/org/maxkey/client/package-info.java b/maxkey-client-sdk/src/main/java/org/maxkey/client/package-info.java new file mode 100644 index 000000000..b8ebc25aa --- /dev/null +++ b/maxkey-client-sdk/src/main/java/org/maxkey/client/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author Administrator + * + */ +package org.maxkey.client; \ No newline at end of file diff --git a/maxkey-client-sdk/src/main/java/pom.xml b/maxkey-client-sdk/src/main/java/pom.xml deleted file mode 100644 index a276ae1bb..000000000 --- a/maxkey-client-sdk/src/main/java/pom.xml +++ /dev/null @@ -1,98 +0,0 @@ - - 4.0.0 - org.scribe - scribe - jar - 1.3.5 - Scribe OAuth Library - The best OAuth library out there - http://github.com/fernandezpablo85/scribe-java - - - org.sonatype.oss - oss-parent - 5 - - - - - fernandezpablo85 - Pablo Fernandez - fernandezpablo85@gmail.com - -3 - - - - - - MIT - http://github.com/fernandezpablo85/scribe-java/blob/master/LICENSE.txt - - - - - scm:http://github.com/fernandezpablo85/scribe-java.git - scm:http://github.com/fernandezpablo85/scribe-java.git - http://github.com/fernandezpablo85/scribe-java.git - - - - - junit - junit - 4.8.1 - test - - - commons-codec - commons-codec - 1.4 - compile - true - - - - - - maven-compiler-plugin - 3.0 - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - - failing-on-high - compile - - check - - - Low - - - - - - - diff --git a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aExample.java b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aExample.java deleted file mode 100644 index df5161d54..000000000 --- a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aExample.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.connsec.client.oauth.test; - -import java.util.*; - -import org.maxkey.client.oauth.builder.ServiceBuilder; -import org.maxkey.client.oauth.builder.api.MaxkeyApi10a; -import org.maxkey.client.oauth.model.Token; -import org.maxkey.client.oauth.oauth.OAuthService; - - -public class Connsec10aExample -{ - private static final String PROTECTED_RESOURCE_URL = "http://api.foursquare.com/v1/user"; - - public static void main(String[] args) - { - OAuthService service = new ServiceBuilder() - .provider(MaxkeyApi10a.class) - .apiKey("tonr-consumer-key") - .apiSecret("SHHHHH!!!!!!!!!!") - .callback(PROTECTED_RESOURCE_URL) - .build(); - Scanner in = new Scanner(System.in); - - System.out.println("=== Foursquare's OAuth Workflow ==="); - System.out.println(); - - // Obtain the Request Token - System.out.println("Fetching the Request Token..."); - Token requestToken = service.getRequestToken(); - System.out.println("Got the Request Token!"); - System.out.println(); - - System.out.println("Now go and authorize Scribe here:"); - System.out.println(service.getAuthorizationUrl(requestToken)); - /* System.out.println("And paste the verifier here"); - System.out.print(">>"); - Verifier verifier = new Verifier(in.nextLine()); - System.out.println(); - - Token requestToken =new Token("3f1fe990-6795-4241-911e-ca0357ecab89",""); - Verifier verifier = new Verifier("w3LGBc"); - // Trade the Request Token and Verfier for the Access Token - System.out.println("Trading the Request Token for an Access Token..."); - Token accessToken = service.getAccessToken(requestToken, verifier); - System.out.println("Got the Access Token!"); - System.out.println("(if your curious it looks like this: " + accessToken + " )"); - System.out.println(); - - // Now let's go and ask for a protected resource! - System.out.println("Now we're going to access a protected resource..."); - OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL); - service.signRequest(accessToken, request); - Response response = request.send(); - System.out.println("Got it! Lets see what we found..."); - System.out.println(); - System.out.println(response.getBody()); - - System.out.println(); - System.out.println("Thats it man! Go and build something awesome with Scribe! :)"); - */ - } -} diff --git a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aVerifierExample.java b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aVerifierExample.java deleted file mode 100644 index 9724ce3ec..000000000 --- a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec10aVerifierExample.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.connsec.client.oauth.test; - -import java.util.*; - -import org.maxkey.client.http.HttpVerb; -import org.maxkey.client.http.Response; -import org.maxkey.client.oauth.builder.ServiceBuilder; -import org.maxkey.client.oauth.builder.api.MaxkeyApi10a; -import org.maxkey.client.oauth.model.OAuthRequest; -import org.maxkey.client.oauth.model.Token; -import org.maxkey.client.oauth.model.Verifier; -import org.maxkey.client.oauth.oauth.OAuthService; - - -public class Connsec10aVerifierExample -{ - private static final String PROTECTED_RESOURCE_URL = "http://api.foursquare.com/v1/user"; - - public static void main(String[] args) - { - OAuthService service = new ServiceBuilder() - .provider(MaxkeyApi10a.class) - .apiKey("tonr-consumer-key") - .apiSecret("SHHHHH!!!!!!!!!!") - .callback(PROTECTED_RESOURCE_URL) - .build(); - Scanner in = new Scanner(System.in); - - System.out.println("=== Foursquare's OAuth Workflow ==="); - System.out.println(); - - // Obtain the Request Token - /* System.out.println("Fetching the Request Token..."); - Token requestToken = service.getRequestToken(); - System.out.println("Got the Request Token!"); - System.out.println(); - - System.out.println("Now go and authorize Scribe here:"); - System.out.println(service.getAuthorizationUrl(requestToken)); - System.out.println("And paste the verifier here"); - System.out.print(">>"); - Verifier verifier = new Verifier(in.nextLine()); - System.out.println(); -*/ - Token requestToken =new Token("d5df60ae-78fa-4a6e-9a66-cd7a84e746ea",""); - Verifier verifier = new Verifier("MSHAor"); - // Trade the Request Token and Verfier for the Access Token - System.out.println("Trading the Request Token for an Access Token..."); - Token accessToken = service.getAccessToken(requestToken, verifier); - System.out.println("Got the Access Token!"); - System.out.println("(if your curious it looks like this: " + accessToken + " )"); - System.out.println(); - - // Now let's go and ask for a protected resource! - System.out.println("Now we're going to access a protected resource..."); - OAuthRequest request = new OAuthRequest(HttpVerb.GET, PROTECTED_RESOURCE_URL); - service.signRequest(accessToken, request); - Response response = request.send(); - System.out.println("Got it! Lets see what we found..."); - System.out.println(); - System.out.println(response.getBody()); - - System.out.println(); - System.out.println("Thats it man! Go and build something awesome with Scribe! :)"); - - } -} diff --git a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/LogerTest.java b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/LogerTest.java deleted file mode 100644 index f8851677c..000000000 --- a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/LogerTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.connsec.client.oauth.test; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -public class LogerTest { - private static Log log = LogFactory.getLog(LogerTest. class ); - /** - * @param args - */ - public static void main(String[] args) { - // TODO Auto-generated method stub - log.info("teset"); - - } - -} diff --git a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec20Example.java b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/MaxKey20Example.java similarity index 98% rename from maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec20Example.java rename to maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/MaxKey20Example.java index 99688ce3d..d1bb0010b 100644 --- a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/Connsec20Example.java +++ b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/MaxKey20Example.java @@ -11,7 +11,7 @@ import org.maxkey.client.oauth.model.Token; import org.maxkey.client.oauth.model.Verifier; import org.maxkey.client.oauth.oauth.OAuthService; -public class Connsec20Example +public class MaxKey20Example { private static final String NETWORK_NAME = "SinaWeibo"; private static final String PROTECTED_RESOURCE_URL = "https://api.weibo.com/2/account/get_uid.json"; diff --git a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/ConnsecPasswordDemo.java b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/MaxkeyPasswordDemo.java similarity index 97% rename from maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/ConnsecPasswordDemo.java rename to maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/MaxkeyPasswordDemo.java index 08974026e..51ae7b30d 100644 --- a/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/ConnsecPasswordDemo.java +++ b/maxkey-client-sdk/src/test/java/com/connsec/client/oauth/test/MaxkeyPasswordDemo.java @@ -6,7 +6,7 @@ import org.maxkey.client.oauth.model.OAuthConfig; import org.maxkey.client.oauth.model.Token; import org.maxkey.client.oauth.oauth.OAuthPasswordService; -public class ConnsecPasswordDemo { +public class MaxkeyPasswordDemo { /** * @param args diff --git a/maxkey-client-sdk/src/test/java/com/connsec/rest/RestClientTest.java b/maxkey-client-sdk/src/test/java/com/connsec/rest/RestClientTest.java index 4d3d9aff4..0521a6a83 100644 --- a/maxkey-client-sdk/src/test/java/com/connsec/rest/RestClientTest.java +++ b/maxkey-client-sdk/src/test/java/com/connsec/rest/RestClientTest.java @@ -16,19 +16,19 @@ public class RestClientTest { OAuthClient tokenRestClient=new OAuthClient("https://exmail.qq.com/cgi-bin/token"); tokenRestClient.addParameter("grant_type", "client_credentials"); - tokenRestClient.addBasicAuthorization("connsec", "66199e4c36b6dfcfb6f1ebceda789432"); + tokenRestClient.addBasicAuthorization("maxkey", "66199e4c36b6dfcfb6f1ebceda789432"); Token token =tokenRestClient.requestAccessToken(); System.out.println(token); OAuthClient authkeyRestClient=new OAuthClient("http://openapi.exmail.qq.com:12211/openapi/mail/authkey"); authkeyRestClient.addBearerAuthorization(token.getAccess_token()); - authkeyRestClient.addParameter("Alias", "test@connsec.com"); + authkeyRestClient.addParameter("Alias", "test@maxkey.org"); HashMap authKey=JsonUtils.gson2Object(authkeyRestClient.execute().getBody(), HashMap.class); String login_url="https://exmail.qq.com/cgi-bin/login?fun=bizopenssologin&method=bizauth&agent=%s&user=%s&ticket=%s"; - System.out.println(String.format(login_url, "connsec","test@connsec.com",authKey.get("auth_key"))); + System.out.println(String.format(login_url, "connsec","test@maxkey.org",authKey.get("auth_key"))); //https://exmail.qq.com/cgi-bin/login?fun=bizopenssologin&method=bizauth&agent=connsec&user=test@connsec.com&ticket=25640C491CA4A056BD1A936C6AA4ABBCAB13AE76EB80E6C3A9259F5E8BFD91D7EA05D10DA3FB18F9BFB445D104CB58A0B4CDE97D9F219F3C } }