From f22f2d8d57332e68d6134d793fb577932f3152b5 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Sun, 2 Jun 2019 10:01:10 +0800 Subject: [PATCH] fix formbase --- .../authz/endpoint/AuthorizeBaseEndpoint.java | 3 +- .../endpoint/FormBasedAuthorizeEndpoint.java | 7 +- .../ltpa/endpoint/LtpaAuthorizeEndpoint.java | 4 + .../maxkey-protocol-simulate/.classpath | 11 - .../maxkey-protocol-simulate/.project | 36 - .../org.eclipse.buildship.core.prefs | 11 - .../org.eclipse.core.resources.prefs | 2 - .../org.eclipse.wst.common.component | 6 - ....eclipse.wst.common.project.facet.core.xml | 7 - .../WebRoot/DesktopSSOApplet.jsp | 36 - .../WebRoot/META-INF/MANIFEST.MF | 3 - .../WEB-INF/classes/META-INF/MANIFEST.MF | 2 - .../WebRoot/WEB-INF/classes/NOTICE | 6 - .../WEB-INF/classes/java.policy.applet | 13 - .../WebRoot/WEB-INF/web.xml | 7 - .../WebRoot/desktopSSOApplet_signed.jar | Bin 36701 -> 0 bytes .../WebRoot/index.jsp | 27 - .../maxkey-protocol-simulate/build.gradle | 8 - .../src/META-INF/MANIFEST.MF | 2 - .../maxkey-protocol-simulate/src/NOTICE | 6 - .../desktop/login/DesktopSSOApplet.java | 68 -- .../com/connsec/desktop/login/ExeParam.java | 159 ---- .../connsec/desktop/login/ExecuteSimuKey.java | 92 --- .../connsec/desktop/login/JsonResolve.java | 82 --- .../desktop/login/SimulationKeyboard.java | 255 ------- .../src/java.policy.applet | 13 - .../src/org/json/simple/ItemList.java | 147 ---- .../src/org/json/simple/JSONArray.java | 381 ---------- .../src/org/json/simple/JSONAware.java | 12 - .../src/org/json/simple/JSONObject.java | 132 ---- .../src/org/json/simple/JSONStreamAware.java | 15 - .../src/org/json/simple/JSONValue.java | 316 -------- .../json/simple/parser/ContainerFactory.java | 23 - .../json/simple/parser/ContentHandler.java | 110 --- .../org/json/simple/parser/JSONParser.java | 533 -------------- .../json/simple/parser/ParseException.java | 90 --- .../src/org/json/simple/parser/Yylex.java | 688 ------------------ .../src/org/json/simple/parser/Yytoken.java | 58 -- .../com/connsec/desktop/login/TestJson.java | 30 - .../test/org/json/simple/JSONArrayTest.java | 288 -------- .../test/org/json/simple/JSONValueTest.java | 256 ------- .../test/org/json/simple/Test.java | 391 ---------- .../org/json/simple/parser/YylexTest.java | 80 -- .../bin/main/messages/message.properties | 16 +- .../resources/messages/message.properties | 16 +- .../webapp/WEB-INF/views/passwordExpired.jsp | 21 +- .../webapp/WEB-INF/views/passwordInitial.jsp | 30 +- .../src/main/webapp/WEB-INF/views/timeout.jsp | 20 +- settings.gradle | 1 - 49 files changed, 93 insertions(+), 4427 deletions(-) delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/.classpath delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/.project delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.buildship.core.prefs delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.core.resources.prefs delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.component delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/WebRoot/DesktopSSOApplet.jsp delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/WebRoot/META-INF/MANIFEST.MF delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/META-INF/MANIFEST.MF delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/NOTICE delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/java.policy.applet delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/web.xml delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/WebRoot/desktopSSOApplet_signed.jar delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/WebRoot/index.jsp delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/build.gradle delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/META-INF/MANIFEST.MF delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/NOTICE delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/DesktopSSOApplet.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/ExeParam.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/ExecuteSimuKey.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/JsonResolve.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/SimulationKeyboard.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/java.policy.applet delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/ItemList.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONArray.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONAware.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONObject.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONStreamAware.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONValue.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ContainerFactory.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ContentHandler.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/JSONParser.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ParseException.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/Yylex.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/Yytoken.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/test/com/connsec/desktop/login/TestJson.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/JSONArrayTest.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/JSONValueTest.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/Test.java delete mode 100644 maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/parser/YylexTest.java diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java index ad78010e..258740a3 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeBaseEndpoint.java @@ -49,9 +49,10 @@ public class AuthorizeBaseEndpoint { return application; } - protected Accounts getAppAccounts(Applications application){ + protected Accounts getAppAccounts(Applications app){ Accounts appAccount=new Accounts(); UserInfo userInfo=WebContext.getUserInfo(); + Applications application= getApplication(app.getId()); if(application.getCredential()==Applications.CREDENTIALS.USER_DEFINED){ appAccount=accountsService.load(new Accounts(userInfo.getId(),application.getId())); diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java index 606c3760..454ac72d 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java @@ -11,6 +11,7 @@ import org.maxkey.authz.formbased.endpoint.adapter.FormBasedDefaultAdapter; import org.maxkey.constants.BOOLEAN; import org.maxkey.dao.service.FormBasedDetailsService; import org.maxkey.domain.Accounts; +import org.maxkey.domain.apps.Applications; import org.maxkey.domain.apps.FormBasedDetails; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; @@ -41,12 +42,14 @@ public class FormBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{ @PathVariable("id") String id){ FormBasedDetails formBasedDetails=formBasedDetailsService.get(id); _logger.debug(""+formBasedDetails); - + Applications application= getApplication(id); + formBasedDetails.setAdapter(application.getAdapter()); + formBasedDetails.setIsAdapter(application.getIsAdapter()); ModelAndView modelAndView=null; Accounts appUser=getAppAccounts(formBasedDetails); - + _logger.debug("Accounts "+appUser); if(appUser == null){ return generateInitCredentialModelAndView(id,"/authorize/formbased/"+id); diff --git a/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/LtpaAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/LtpaAuthorizeEndpoint.java index 436b5af4..d9289ff2 100644 --- a/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/LtpaAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-ltpa/src/main/java/org/maxkey/authz/ltpa/endpoint/LtpaAuthorizeEndpoint.java @@ -13,6 +13,7 @@ import org.maxkey.authz.ltpa.endpoint.adapter.LtpaDefaultAdapter; import org.maxkey.config.ApplicationConfig; import org.maxkey.constants.BOOLEAN; import org.maxkey.dao.service.TokenBasedDetailsService; +import org.maxkey.domain.apps.Applications; import org.maxkey.domain.apps.TokenBasedDetails; import org.maxkey.util.Instance; import org.maxkey.web.WebContext; @@ -50,6 +51,9 @@ public class LtpaAuthorizeEndpoint extends AuthorizeBaseEndpoint{ TokenBasedDetails ltpaDetails=tokenBasedDetailsService.get(id); _logger.debug(""+ltpaDetails); String cookieValue=""; + Applications application= getApplication(id); + ltpaDetails.setAdapter(application.getAdapter()); + ltpaDetails.setIsAdapter(application.getIsAdapter()); AbstractAuthorizeAdapter adapter; diff --git a/maxkey-protocols/maxkey-protocol-simulate/.classpath b/maxkey-protocols/maxkey-protocol-simulate/.classpath deleted file mode 100644 index aa1a7e5d..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/maxkey-protocols/maxkey-protocol-simulate/.project b/maxkey-protocols/maxkey-protocol-simulate/.project deleted file mode 100644 index e3522b47..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - maxkey-protocol-simulate - maxkey-protocol-simulate - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.buildship.core.prefs b/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 11af0757..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -build.commands=org.eclipse.jdt.core.javabuilder,org.eclipse.wst.common.project.facet.core.builder,org.eclipse.wst.validation.validationbuilder -connection.arguments= -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) -connection.java.home=null -connection.jvm.arguments= -connection.project.dir=../.. -containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7/,org.eclipse.jst.j2ee.internal.web.container -derived.resources=.gradle,build -eclipse.preferences.version=1 -natures=org.eclipse.jdt.core.javanature,org.eclipse.wst.common.project.facet.core.nature,org.eclipse.wst.common.modulecore.ModuleCoreNature,org.eclipse.jem.workbench.JavaEMFNature -project.path=\:maxkey-protocols\:maxkey-protocol-simulate diff --git a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.core.resources.prefs b/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 896a9a53..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.component b/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.component deleted file mode 100644 index a2d44d30..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.project.facet.core.xml b/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index cea524ad..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/DesktopSSOApplet.jsp b/maxkey-protocols/maxkey-protocol-simulate/WebRoot/DesktopSSOApplet.jsp deleted file mode 100644 index 0570dac2..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/DesktopSSOApplet.jsp +++ /dev/null @@ -1,36 +0,0 @@ - - - - ClientSSOApplet - - - - - - - - -<% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+path+"/"; -//request.getRequestDispatcher( "/WEB-INF/Test.jsp").forward(request,response); -%> - - <% - String typeCode="\t\t\t\t\t\t\t\t1046\tse\n"; - String execPath="{execPath:\"tttt\"}"; - String type="BOTH";//SIMULATION,PARAMETER,BOTH - String encoderParam=(new sun.misc.BASE64Encoder()).encode( execPath.getBytes() ); - %> - - - - - - - diff --git a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-simulate/WebRoot/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e1..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/META-INF/MANIFEST.MF deleted file mode 100644 index 59499bce..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/NOTICE b/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/NOTICE deleted file mode 100644 index 8cabcfe5..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -Copyright 2014, ConnSec, Inc. -This project includes software developed by ConnSec. -http://www.connsec.com - -This project includes: - JSON.simple under The Apache Software License, Version 2.0 \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/java.policy.applet b/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/java.policy.applet deleted file mode 100644 index 9989b9ed..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/classes/java.policy.applet +++ /dev/null @@ -1,13 +0,0 @@ -/* DO NOT EDIT */ - -grant { - permission java.security.AllPermission; - permission java.awt.AWTPermission "createRobot"; - permission java.awt.AWTPermission "accessClipboard"; - permission java.awt.AWTPermission "accessEventQueue"; - permission java.awt.AWTPermission "showWindowWithoutWarningBanner"; - permission java.awt.AWTPermission "readDisplayPixels", "read"; - - permission java.io.FilePermission "<>", "read, write, delete, execute"; -}; - diff --git a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/web.xml b/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/web.xml deleted file mode 100644 index 811b2649..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/WEB-INF/web.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - index.jsp - - \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/desktopSSOApplet_signed.jar b/maxkey-protocols/maxkey-protocol-simulate/WebRoot/desktopSSOApplet_signed.jar deleted file mode 100644 index 808f5216962715b86c2ec4fa8ecbc79fc1fc5bb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36701 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 diff --git a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/index.jsp b/maxkey-protocols/maxkey-protocol-simulate/WebRoot/index.jsp deleted file mode 100644 index 250b154a..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/WebRoot/index.jsp +++ /dev/null @@ -1,27 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="ISO-8859-1"%> -<% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; -//request.getRequestDispatcher( "/WEB-INF/Test.jsp").forward(request,response); -%> - - - - - - - My JSP 'index.jsp' starting page - - - - - - - - - - This is my JSP page.
- - diff --git a/maxkey-protocols/maxkey-protocol-simulate/build.gradle b/maxkey-protocols/maxkey-protocol-simulate/build.gradle deleted file mode 100644 index 843d187e..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -description = "maxkey-protocol-simulate" - -apply plugin: 'war' -apply plugin: 'eclipse-wtp' - -dependencies { - -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-simulate/src/META-INF/MANIFEST.MF deleted file mode 100644 index 59499bce..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/NOTICE b/maxkey-protocols/maxkey-protocol-simulate/src/NOTICE deleted file mode 100644 index 8cabcfe5..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -Copyright 2014, ConnSec, Inc. -This project includes software developed by ConnSec. -http://www.connsec.com - -This project includes: - JSON.simple under The Apache Software License, Version 2.0 \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/DesktopSSOApplet.java b/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/DesktopSSOApplet.java deleted file mode 100644 index a2417c11..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/DesktopSSOApplet.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.connsec.desktop.login; - -import javax.swing.JApplet; - - -import javax.swing.JProgressBar; -import java.io.IOException; - -import javax.swing.JTextPane; -import javax.swing.JLabel; - -import sun.misc.BASE64Decoder; - -/** - * @author Crystal.Sea - * - */ -public class DesktopSSOApplet extends JApplet { - ExecuteSimuKey executeSimuKey; - /** - * - */ - private static final long serialVersionUID = -8708906696879467549L; - - /** - * Create the applet. - */ - public DesktopSSOApplet() { - getContentPane().setLayout(null); - JProgressBar progressBar = new JProgressBar(); - progressBar.setValue(5); - progressBar.setBounds(31, 105, 330, 57); - getContentPane().add(progressBar); - - - JTextPane textPane = new JTextPane(); - textPane.setBounds(91, 55, 82, 21); - getContentPane().add(textPane); - - JLabel lblNewLabel = new JLabel("New label"); - lblNewLabel.setBounds(162, 32, 54, 15); - getContentPane().add(lblNewLabel); - - } - - public void init() { - // Put your code here - String jsonParam=null; - String encoderParam=this.getParameter("encoderParam"); - System.out.println("encoder Param : "+encoderParam); - try { - byte[] decodeParam=(new BASE64Decoder()).decodeBuffer(encoderParam); - jsonParam=new String(decodeParam); - System.out.println("json Paramen :"+jsonParam); - } catch (IOException e) { - e.printStackTrace(); - } - - if(jsonParam==null) { - System.out.println("json Param can not been null ."); - return; - } - executeSimuKey=new ExecuteSimuKey(jsonParam); - - executeSimuKey.executeAll(); - - } -} diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/ExeParam.java b/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/ExeParam.java deleted file mode 100644 index 4f85b020..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/ExeParam.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.connsec.desktop.login; - -/** - * @author Crystal.Sea - * - */ -public class ExeParam { - - private String programPath; - - //PARAMETER,SIMULATION - private String parameter; - - private String preUsername; - - private String usernameType;//PARAMETER,SIMULATION - - private String usernameParameter; - - private String username; - - private String prePassword; - - private String passwordType;//PARAMETER,SIMULATION - - private String passwordParameter; - - private String password; - - - private String preSubmit; - //Enter or key - private String submitType; - - private String submitKey; - - public ExeParam() { - - } - - - public String getProgramPath() { - return programPath; - } - - public void setProgramPath(String programPath) { - this.programPath = programPath; - } - - public String getParameter() { - return parameter; - } - - public void setParameter(String parameter) { - this.parameter = parameter; - } - - public String getPreUsername() { - return preUsername; - } - - public void setPreUsername(String preUsername) { - this.preUsername = preUsername; - } - - public String getUsernameType() { - return usernameType; - } - - public void setUsernameType(String usernameType) { - this.usernameType = usernameType; - } - - public String getUsernameParameter() { - return usernameParameter; - } - - public void setUsernameParameter(String usernameParameter) { - this.usernameParameter = usernameParameter; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPrePassword() { - return prePassword; - } - - public void setPrePassword(String prePassword) { - this.prePassword = prePassword; - } - - public String getPasswordType() { - return passwordType; - } - - public void setPasswordType(String passwordType) { - this.passwordType = passwordType; - } - - public String getPasswordParameter() { - return passwordParameter; - } - - public void setPasswordParameter(String passwordParameter) { - this.passwordParameter = passwordParameter; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getPreSubmit() { - return preSubmit; - } - - public void setPreSubmit(String preSubmit) { - this.preSubmit = preSubmit; - } - - public String getSubmitType() { - return submitType; - } - - public void setSubmitType(String submitType) { - this.submitType = submitType; - } - - public String getSubmitKey() { - return submitKey; - } - - public void setSubmitKey(String submitKey) { - this.submitKey = submitKey; - } - - @Override - public String toString() { - return "ExeParam [programPath=" + programPath + ", parameter=" - + parameter + ", preUsername=" + preUsername - + ", usernameType=" + usernameType + ", usernameParameter=" - + usernameParameter + ", username=" + username - + ", prePassword=" + prePassword + ", passwordType=" - + passwordType + ", passwordParameter=" + passwordParameter - + ", password=" + password + ", preSubmit=" + preSubmit - + ", submitType=" + submitType + ", submitKey=" + submitKey - + "]"; - } - -} diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/ExecuteSimuKey.java b/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/ExecuteSimuKey.java deleted file mode 100644 index c0955780..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/ExecuteSimuKey.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.connsec.desktop.login; - -import java.security.AccessController; -import java.security.PrivilegedAction; - -/** - * @author Crystal.Sea - * - */ -public class ExecuteSimuKey { - ExeParam exeParam; - SimulationKeyboard simulationKeyboard; - - public ExecuteSimuKey() { - - } - - public ExecuteSimuKey(String jsonParam) { - simulationKeyboard=new SimulationKeyboard(); - - exeParam=JsonResolve.resolve(jsonParam); - } - - public void executetProgram(){ - final String execPath=exeParam.getProgramPath()+" " +(exeParam.getParameter()==null?"":exeParam.getParameter()); - System.out.println(execPath); - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - try{ - Runtime.getRuntime().exec(execPath); - simulationKeyboard.getRobot().delay(8000); - }catch (Exception e){ - System.out.println("Caught exception in privileged block, Exception:" + e.toString()); - } - return null; // nothing to return - } - }); - } - - public void simulationUsername(){ - - if(exeParam.getUsernameType().equalsIgnoreCase("SIMULATION")) { - if(null!=exeParam.getPreUsername()&&!"".equals(exeParam.getPreUsername())){ - pressKey(exeParam.getPreUsername()); - } - pressKey(exeParam.getUsername()); - } - } - - public void simulationPassword(){ - if(exeParam.getPasswordType().equalsIgnoreCase("SIMULATION")) { - if(null!=exeParam.getPrePassword()&&!"".equals(exeParam.getPrePassword())){ - pressKey(exeParam.getPrePassword()); - } - pressKey(exeParam.getPassword()); - } - } - - public void enterProgram(){ - if(null!=exeParam.getPreSubmit()&&!"".equals(exeParam.getPreSubmit())){ - pressKey(exeParam.getPreSubmit()); - } - - if("Enter".equalsIgnoreCase(exeParam.getSubmitType())){ - simulationKeyboard.pressEnter(); - }else if("Key".equalsIgnoreCase(exeParam.getSubmitType())){ - if(null==exeParam.getSubmitKey()||"".equals(exeParam.getSubmitKey())){ - System.out.println("SubmitType is Key , SubmitKey can not be null or empty. "); - } - simulationKeyboard.pressAltKey(exeParam.getSubmitKey().charAt(0)); - } - } - - public void executeAll(){ - - executetProgram(); - - simulationUsername(); - - simulationPassword(); - - enterProgram(); - } - - private void pressKey(String key){ - char[] pressKeyStr = key.toCharArray(); - for (int i = 0; i < pressKeyStr.length; i++) { - simulationKeyboard.type(pressKeyStr[i]); - } - } - -} diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/JsonResolve.java b/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/JsonResolve.java deleted file mode 100644 index ebc9c49c..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/JsonResolve.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.connsec.desktop.login; - -import org.json.simple.JSONObject; -import org.json.simple.JSONValue; - - -/** - * @author Crystal.Sea - * - */ -public class JsonResolve { - - public static ExeParam resolve(String json) { - - ExeParam exeParam=new ExeParam(); - if(null!=json){ - Object parseObj=JSONValue.parse(json); - JSONObject jsonObj=(JSONObject)parseObj; - //program Execute physical Path - if(null!=jsonObj.get("programPath")){ - exeParam.setProgramPath(jsonObj.get("programPath").toString()); - System.out.println("programPath : "+jsonObj.get("programPath").toString()); - } - - //parameter - if(null!=jsonObj.get("parameter")){ - exeParam.setParameter(jsonObj.get("parameter").toString()); - System.out.println("parameter : "+jsonObj.get("parameter").toString()); - } - - if(null!=jsonObj.get("preUsername")){ - exeParam.setPreUsername("submitKey : "+jsonObj.get("preUsername").toString()); - } - if(null!=jsonObj.get("usernameType")){ - exeParam.setUsernameType(jsonObj.get("usernameType").toString()); - System.out.println("usernameType : "+jsonObj.get("usernameType").toString()); - } - if(null!=jsonObj.get("usernameParameter")){ - exeParam.setUsernameParameter(jsonObj.get("usernameParameter").toString()); - System.out.println("usernameParameter : "+jsonObj.get("usernameParameter").toString()); - } - //username - if(null!=jsonObj.get("username")){ - exeParam.setUsername(jsonObj.get("username").toString()); - System.out.println("username : "+jsonObj.get("username").toString()); - } - - //password - if(null!=jsonObj.get("prePassword")){ - exeParam.setPrePassword("submitKey : "+jsonObj.get("prePassword").toString()); - } - if(null!=jsonObj.get("passwordType")){ - exeParam.setPasswordType(jsonObj.get("passwordType").toString()); - System.out.println("passwordType : "+jsonObj.get("passwordType").toString()); - } - if(null!=jsonObj.get("passwordParameter")){ - exeParam.setPasswordParameter(jsonObj.get("passwordParameter").toString()); - System.out.println("passwordParameter : "+jsonObj.get("passwordParameter").toString()); - } - if(null!=jsonObj.get("password")){ - exeParam.setPassword(jsonObj.get("password").toString()); - System.out.println("password : ******"); - } - //submit - if(null!=jsonObj.get("preSubmit")){ - exeParam.setPreSubmit(jsonObj.get("preSubmit").toString()); - System.out.println("preSubmit : "+jsonObj.get("preSubmit").toString()); - } - if(null!=jsonObj.get("submitType")){ - exeParam.setSubmitType(jsonObj.get("submitType").toString()); - System.out.println("submitType : "+jsonObj.get("submitType").toString()); - } - if(null!=jsonObj.get("submitKey")){ - exeParam.setSubmitKey(jsonObj.get("submitKey").toString()); - System.out.println("submitKey : "+jsonObj.get("submitKey").toString()); - } - } - - return exeParam; - - } -} diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/SimulationKeyboard.java b/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/SimulationKeyboard.java deleted file mode 100644 index 5392ff1a..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/com/connsec/desktop/login/SimulationKeyboard.java +++ /dev/null @@ -1,255 +0,0 @@ -package com.connsec.desktop.login; - - -import java.awt.AWTException; -import java.awt.Robot; -import java.awt.event.KeyEvent; - -/** - * @author Crystal.Sea - * - */ -public class SimulationKeyboard { - //用于控制鼠标和键盘 - private Robot robot; - - public SimulationKeyboard() { - try { - this.robot = new Robot(); - // delay 2 min - robot.delay(2000); - } catch (AWTException e) { - e.printStackTrace(); - } - } - - public SimulationKeyboard(Robot robot) { - this.robot = robot; - } - - - public void pressKey(int keyvalue) { - robot.keyPress(keyvalue); - robot.keyRelease(keyvalue); - } - - public void pressKeyWithCapsLock(int keyvalue) { - // CapsLock - robot.keyPress(KeyEvent.VK_CAPS_LOCK); - robot.keyRelease(KeyEvent.VK_CAPS_LOCK); - // input Char - robot.keyPress(keyvalue); - robot.keyRelease(keyvalue); - - // release CapsLock - robot.keyPress(KeyEvent.VK_CAPS_LOCK); - robot.keyRelease(KeyEvent.VK_CAPS_LOCK); - - } - - public void pressKeyWithShift( int keyvalue) { - // Shift - robot.keyPress(KeyEvent.VK_SHIFT); - // input Char - robot.keyPress(keyvalue); - robot.keyRelease(keyvalue); - - // release Shift - robot.keyRelease(KeyEvent.VK_SHIFT); - - } - - public void pressKeyWithAlt( int keyvalue) { - // Alt - robot.keyPress(KeyEvent.VK_ALT); - // input Char - robot.keyPress(keyvalue); - robot.keyRelease(keyvalue); - - // release Alt - robot.keyRelease(KeyEvent.VK_ALT); - - } - - public void pressEnter() { - robot.delay(2000); - pressKey(KeyEvent.VK_ENTER); - } - - - public void pressAltKey(char character){ - switch (character) { - case 'a' : pressKeyWithAlt(KeyEvent.VK_A); break; - case 'b' : pressKeyWithAlt(KeyEvent.VK_B); break; - case 'c' : pressKeyWithAlt(KeyEvent.VK_C); break; - case 'd' : pressKeyWithAlt(KeyEvent.VK_D); break; - case 'e' : pressKeyWithAlt(KeyEvent.VK_E); break; - case 'f' : pressKeyWithAlt(KeyEvent.VK_F); break; - case 'g' : pressKeyWithAlt(KeyEvent.VK_G); break; - case 'h' : pressKeyWithAlt(KeyEvent.VK_H); break; - case 'i' : pressKeyWithAlt(KeyEvent.VK_I); break; - case 'j' : pressKeyWithAlt(KeyEvent.VK_J); break; - case 'k' : pressKeyWithAlt(KeyEvent.VK_K); break; - case 'l' : pressKeyWithAlt(KeyEvent.VK_L); break; - case 'm' : pressKeyWithAlt(KeyEvent.VK_M); break; - case 'n' : pressKeyWithAlt(KeyEvent.VK_N); break; - case 'o' : pressKeyWithAlt(KeyEvent.VK_O); break; - case 'p' : pressKeyWithAlt(KeyEvent.VK_P); break; - case 'q' : pressKeyWithAlt(KeyEvent.VK_Q); break; - case 'r' : pressKeyWithAlt(KeyEvent.VK_R); break; - case 's' : pressKeyWithAlt(KeyEvent.VK_S); break; - case 't' : pressKeyWithAlt(KeyEvent.VK_T); break; - case 'u' : pressKeyWithAlt(KeyEvent.VK_U); break; - case 'v' : pressKeyWithAlt(KeyEvent.VK_V); break; - case 'w' : pressKeyWithAlt(KeyEvent.VK_W); break; - case 'x' : pressKeyWithAlt(KeyEvent.VK_X); break; - case 'y' : pressKeyWithAlt(KeyEvent.VK_Y); break; - case 'z' : pressKeyWithAlt(KeyEvent.VK_Z); break; - - case 'A' : pressKeyWithAlt( KeyEvent.VK_A); break; - case 'B' : pressKeyWithAlt( KeyEvent.VK_B); break; - case 'C' : pressKeyWithAlt( KeyEvent.VK_C); break; - case 'D' : pressKeyWithAlt( KeyEvent.VK_D); break; - case 'E' : pressKeyWithAlt( KeyEvent.VK_E); break; - case 'F' : pressKeyWithAlt( KeyEvent.VK_F); break; - case 'G' : pressKeyWithAlt( KeyEvent.VK_G); break; - case 'H' : pressKeyWithAlt( KeyEvent.VK_H); break; - case 'I' : pressKeyWithAlt( KeyEvent.VK_I); break; - case 'J' : pressKeyWithAlt( KeyEvent.VK_J); break; - case 'K' : pressKeyWithAlt( KeyEvent.VK_K); break; - case 'L' : pressKeyWithAlt( KeyEvent.VK_L); break; - case 'M' : pressKeyWithAlt( KeyEvent.VK_M); break; - case 'N' : pressKeyWithAlt( KeyEvent.VK_N); break; - case 'O' : pressKeyWithAlt( KeyEvent.VK_O); break; - case 'P' : pressKeyWithAlt( KeyEvent.VK_P); break; - case 'Q' : pressKeyWithAlt( KeyEvent.VK_Q); break; - case 'R' : pressKeyWithAlt( KeyEvent.VK_R); break; - case 'S' : pressKeyWithAlt( KeyEvent.VK_S); break; - case 'T' : pressKeyWithAlt( KeyEvent.VK_T); break; - case 'U' : pressKeyWithAlt( KeyEvent.VK_U); break; - case 'V' : pressKeyWithAlt( KeyEvent.VK_V); break; - case 'W' : pressKeyWithAlt( KeyEvent.VK_W); break; - case 'X' : pressKeyWithAlt( KeyEvent.VK_X); break; - case 'Y' : pressKeyWithAlt( KeyEvent.VK_Y); break; - case 'Z' : pressKeyWithAlt( KeyEvent.VK_Z); break; - } - } - - - public void type(char character) { - switch (character) { - case 'a' : pressKey(KeyEvent.VK_A); break; - case 'b' : pressKey(KeyEvent.VK_B); break; - case 'c' : pressKey(KeyEvent.VK_C); break; - case 'd' : pressKey(KeyEvent.VK_D); break; - case 'e' : pressKey(KeyEvent.VK_E); break; - case 'f' : pressKey(KeyEvent.VK_F); break; - case 'g' : pressKey(KeyEvent.VK_G); break; - case 'h' : pressKey(KeyEvent.VK_H); break; - case 'i' : pressKey(KeyEvent.VK_I); break; - case 'j' : pressKey(KeyEvent.VK_J); break; - case 'k' : pressKey(KeyEvent.VK_K); break; - case 'l' : pressKey(KeyEvent.VK_L); break; - case 'm' : pressKey(KeyEvent.VK_M); break; - case 'n' : pressKey(KeyEvent.VK_N); break; - case 'o' : pressKey(KeyEvent.VK_O); break; - case 'p' : pressKey(KeyEvent.VK_P); break; - case 'q' : pressKey(KeyEvent.VK_Q); break; - case 'r' : pressKey(KeyEvent.VK_R); break; - case 's' : pressKey(KeyEvent.VK_S); break; - case 't' : pressKey(KeyEvent.VK_T); break; - case 'u' : pressKey(KeyEvent.VK_U); break; - case 'v' : pressKey(KeyEvent.VK_V); break; - case 'w' : pressKey(KeyEvent.VK_W); break; - case 'x' : pressKey(KeyEvent.VK_X); break; - case 'y' : pressKey(KeyEvent.VK_Y); break; - case 'z' : pressKey(KeyEvent.VK_Z); break; - - case 'A' : pressKeyWithCapsLock( KeyEvent.VK_A); break; - case 'B' : pressKeyWithCapsLock( KeyEvent.VK_B); break; - case 'C' : pressKeyWithCapsLock( KeyEvent.VK_C); break; - case 'D' : pressKeyWithCapsLock( KeyEvent.VK_D); break; - case 'E' : pressKeyWithCapsLock( KeyEvent.VK_E); break; - case 'F' : pressKeyWithCapsLock( KeyEvent.VK_F); break; - case 'G' : pressKeyWithCapsLock( KeyEvent.VK_G); break; - case 'H' : pressKeyWithCapsLock( KeyEvent.VK_H); break; - case 'I' : pressKeyWithCapsLock( KeyEvent.VK_I); break; - case 'J' : pressKeyWithCapsLock( KeyEvent.VK_J); break; - case 'K' : pressKeyWithCapsLock( KeyEvent.VK_K); break; - case 'L' : pressKeyWithCapsLock( KeyEvent.VK_L); break; - case 'M' : pressKeyWithCapsLock( KeyEvent.VK_M); break; - case 'N' : pressKeyWithCapsLock( KeyEvent.VK_N); break; - case 'O' : pressKeyWithCapsLock( KeyEvent.VK_O); break; - case 'P' : pressKeyWithCapsLock( KeyEvent.VK_P); break; - case 'Q' : pressKeyWithCapsLock( KeyEvent.VK_Q); break; - case 'R' : pressKeyWithCapsLock( KeyEvent.VK_R); break; - case 'S' : pressKeyWithCapsLock( KeyEvent.VK_S); break; - case 'T' : pressKeyWithCapsLock( KeyEvent.VK_T); break; - case 'U' : pressKeyWithCapsLock( KeyEvent.VK_U); break; - case 'V' : pressKeyWithCapsLock( KeyEvent.VK_V); break; - case 'W' : pressKeyWithCapsLock( KeyEvent.VK_W); break; - case 'X' : pressKeyWithCapsLock( KeyEvent.VK_X); break; - case 'Y' : pressKeyWithCapsLock( KeyEvent.VK_Y); break; - case 'Z' : pressKeyWithCapsLock( KeyEvent.VK_Z); break; - - case '`' : pressKey(KeyEvent.VK_BACK_QUOTE); break; - case '0' : pressKey(KeyEvent.VK_0); break; - case '1' : pressKey(KeyEvent.VK_1); break; - case '2' : pressKey(KeyEvent.VK_2); break; - case '3' : pressKey(KeyEvent.VK_3); break; - case '4' : pressKey(KeyEvent.VK_4); break; - case '5' : pressKey(KeyEvent.VK_5); break; - case '6' : pressKey(KeyEvent.VK_6); break; - case '7' : pressKey(KeyEvent.VK_7); break; - case '8' : pressKey(KeyEvent.VK_8); break; - case '9' : pressKey(KeyEvent.VK_9); break; - case '-' : pressKey(KeyEvent.VK_MINUS); break; - case '=' : pressKey(KeyEvent.VK_EQUALS); break; - - case '~' : pressKeyWithShift(KeyEvent.VK_BACK_QUOTE); break; - case '!' : pressKeyWithShift(KeyEvent.VK_1); break; - case '@' : pressKeyWithShift(KeyEvent.VK_2); break; - case '#' : pressKeyWithShift(KeyEvent.VK_3); break; - case '$' : pressKeyWithShift(KeyEvent.VK_4); break; - case '%' : pressKeyWithShift(KeyEvent.VK_5); break; - case '^' : pressKeyWithShift(KeyEvent.VK_6); break; - case '&' : pressKeyWithShift(KeyEvent.VK_7); break; - case '*' : pressKeyWithShift(KeyEvent.VK_8); break; - case '(' : pressKeyWithShift(KeyEvent.VK_9); break; - case ')' : pressKeyWithShift(KeyEvent.VK_0); break; - case '_' : pressKeyWithShift(KeyEvent.VK_MINUS ); break; - case '+' : pressKeyWithShift(KeyEvent.VK_EQUALS); break; - - case '[' : pressKey(KeyEvent.VK_OPEN_BRACKET); break; - case ']' : pressKey(KeyEvent.VK_CLOSE_BRACKET); break; - case '\\' : pressKey(KeyEvent.VK_BACK_SLASH); break; - case '{' : pressKeyWithShift( KeyEvent.VK_OPEN_BRACKET); break; - case '}' : pressKeyWithShift(KeyEvent.VK_CLOSE_BRACKET); break; - case '|' : pressKeyWithShift( KeyEvent.VK_BACK_SLASH); break; - - case ';' : pressKey(KeyEvent.VK_SEMICOLON); break; - case ':' : pressKeyWithShift(KeyEvent.VK_SEMICOLON); break; - case '\'' : pressKey(KeyEvent.VK_QUOTE); break; - case '"' : pressKeyWithShift(KeyEvent.VK_QUOTE); break; - - case ',' : pressKey(KeyEvent.VK_COMMA); break; - case '<' : pressKeyWithShift(KeyEvent.VK_COMMA); break; - case '.' : pressKey(KeyEvent.VK_PERIOD); break; - case '>' : pressKeyWithShift(KeyEvent.VK_PERIOD); break; - case '/' : pressKey(KeyEvent.VK_SLASH); break; - case '?' : pressKeyWithShift(KeyEvent.VK_SLASH); break; - - case ' ' : pressKey(KeyEvent.VK_SPACE); break; - - case '\t' : pressKey(KeyEvent.VK_TAB); break; - case '\n' : robot.delay(2000);pressKey(KeyEvent.VK_ENTER); break; - default: - throw new IllegalArgumentException("Cannot type character " + character); - } - } - - public Robot getRobot() { - return robot; - } - -} diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/java.policy.applet b/maxkey-protocols/maxkey-protocol-simulate/src/java.policy.applet deleted file mode 100644 index 9989b9ed..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/java.policy.applet +++ /dev/null @@ -1,13 +0,0 @@ -/* DO NOT EDIT */ - -grant { - permission java.security.AllPermission; - permission java.awt.AWTPermission "createRobot"; - permission java.awt.AWTPermission "accessClipboard"; - permission java.awt.AWTPermission "accessEventQueue"; - permission java.awt.AWTPermission "showWindowWithoutWarningBanner"; - permission java.awt.AWTPermission "readDisplayPixels", "read"; - - permission java.io.FilePermission "<>", "read, write, delete, execute"; -}; - diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/ItemList.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/ItemList.java deleted file mode 100644 index ed633076..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/ItemList.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * $Id: ItemList.java,v 1.1 2006/04/15 14:10:48 platform Exp $ - * Created on 2006-3-24 - */ -package org.json.simple; - -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -/** - * |a:b:c| => |a|,|b|,|c| - * |:| => ||,|| - * |a:| => |a|,|| - * @author FangYidong - */ -public class ItemList { - private String sp=","; - List items=new ArrayList(); - - - public ItemList(){} - - - public ItemList(String s){ - this.split(s,sp,items); - } - - public ItemList(String s,String sp){ - this.sp=s; - this.split(s,sp,items); - } - - public ItemList(String s,String sp,boolean isMultiToken){ - split(s,sp,items,isMultiToken); - } - - public List getItems(){ - return this.items; - } - - public String[] getArray(){ - return (String[])this.items.toArray(); - } - - public void split(String s,String sp,List append,boolean isMultiToken){ - if(s==null || sp==null) - return; - if(isMultiToken){ - StringTokenizer tokens=new StringTokenizer(s,sp); - while(tokens.hasMoreTokens()){ - append.add(tokens.nextToken().trim()); - } - } - else{ - this.split(s,sp,append); - } - } - - public void split(String s,String sp,List append){ - if(s==null || sp==null) - return; - int pos=0; - int prevPos=0; - do{ - prevPos=pos; - pos=s.indexOf(sp,pos); - if(pos==-1) - break; - append.add(s.substring(prevPos,pos).trim()); - pos+=sp.length(); - }while(pos!=-1); - append.add(s.substring(prevPos).trim()); - } - - public void setSP(String sp){ - this.sp=sp; - } - - public void add(int i,String item){ - if(item==null) - return; - items.add(i,item.trim()); - } - - public void add(String item){ - if(item==null) - return; - items.add(item.trim()); - } - - public void addAll(ItemList list){ - items.addAll(list.items); - } - - public void addAll(String s){ - this.split(s,sp,items); - } - - public void addAll(String s,String sp){ - this.split(s,sp,items); - } - - public void addAll(String s,String sp,boolean isMultiToken){ - this.split(s,sp,items,isMultiToken); - } - - /** - * @param i 0-based - * @return - */ - public String get(int i){ - return (String)items.get(i); - } - - public int size(){ - return items.size(); - } - - public String toString(){ - return toString(sp); - } - - public String toString(String sp){ - StringBuffer sb=new StringBuffer(); - - for(int i=0;i - */ -public class JSONArray extends ArrayList implements JSONAware, JSONStreamAware { - private static final long serialVersionUID = 3957988303675231981L; - - /** - * Constructs an empty JSONArray. - */ - public JSONArray(){ - super(); - } - - /** - * Constructs a JSONArray containing the elements of the specified - * collection, in the order they are returned by the collection's iterator. - * - * @param c the collection whose elements are to be placed into this JSONArray - */ - public JSONArray(Collection c){ - super(c); - } - - /** - * Encode a list into JSON text and write it to out. - * If this list is also a JSONStreamAware or a JSONAware, JSONStreamAware and JSONAware specific behaviours will be ignored at this top level. - * - * @see org.json.simple.JSONValue#writeJSONString(Object, Writer) - * - * @param collection - * @param out - */ - public static void writeJSONString(Collection collection, Writer out) throws IOException{ - if(collection == null){ - out.write("null"); - return; - } - - boolean first = true; - Iterator iter=collection.iterator(); - - out.write('['); - while(iter.hasNext()){ - if(first) - first = false; - else - out.write(','); - - Object value=iter.next(); - if(value == null){ - out.write("null"); - continue; - } - - JSONValue.writeJSONString(value, out); - } - out.write(']'); - } - - public void writeJSONString(Writer out) throws IOException{ - writeJSONString(this, out); - } - - /** - * Convert a list to JSON text. The result is a JSON array. - * If this list is also a JSONAware, JSONAware specific behaviours will be omitted at this top level. - * - * @see org.json.simple.JSONValue#toJSONString(Object) - * - * @param collection - * @return JSON text, or "null" if list is null. - */ - public static String toJSONString(Collection collection){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(collection, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - public static void writeJSONString(byte[] array, Writer out) throws IOException{ - if(array == null){ - out.write("null"); - } else if(array.length == 0) { - out.write("[]"); - } else { - out.write("["); - out.write(String.valueOf(array[0])); - - for(int i = 1; i < array.length; i++){ - out.write(","); - out.write(String.valueOf(array[i])); - } - - out.write("]"); - } - } - - public static String toJSONString(byte[] array){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(array, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - public static void writeJSONString(short[] array, Writer out) throws IOException{ - if(array == null){ - out.write("null"); - } else if(array.length == 0) { - out.write("[]"); - } else { - out.write("["); - out.write(String.valueOf(array[0])); - - for(int i = 1; i < array.length; i++){ - out.write(","); - out.write(String.valueOf(array[i])); - } - - out.write("]"); - } - } - - public static String toJSONString(short[] array){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(array, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - public static void writeJSONString(int[] array, Writer out) throws IOException{ - if(array == null){ - out.write("null"); - } else if(array.length == 0) { - out.write("[]"); - } else { - out.write("["); - out.write(String.valueOf(array[0])); - - for(int i = 1; i < array.length; i++){ - out.write(","); - out.write(String.valueOf(array[i])); - } - - out.write("]"); - } - } - - public static String toJSONString(int[] array){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(array, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - public static void writeJSONString(long[] array, Writer out) throws IOException{ - if(array == null){ - out.write("null"); - } else if(array.length == 0) { - out.write("[]"); - } else { - out.write("["); - out.write(String.valueOf(array[0])); - - for(int i = 1; i < array.length; i++){ - out.write(","); - out.write(String.valueOf(array[i])); - } - - out.write("]"); - } - } - - public static String toJSONString(long[] array){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(array, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - public static void writeJSONString(float[] array, Writer out) throws IOException{ - if(array == null){ - out.write("null"); - } else if(array.length == 0) { - out.write("[]"); - } else { - out.write("["); - out.write(String.valueOf(array[0])); - - for(int i = 1; i < array.length; i++){ - out.write(","); - out.write(String.valueOf(array[i])); - } - - out.write("]"); - } - } - - public static String toJSONString(float[] array){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(array, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - public static void writeJSONString(double[] array, Writer out) throws IOException{ - if(array == null){ - out.write("null"); - } else if(array.length == 0) { - out.write("[]"); - } else { - out.write("["); - out.write(String.valueOf(array[0])); - - for(int i = 1; i < array.length; i++){ - out.write(","); - out.write(String.valueOf(array[i])); - } - - out.write("]"); - } - } - - public static String toJSONString(double[] array){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(array, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - public static void writeJSONString(boolean[] array, Writer out) throws IOException{ - if(array == null){ - out.write("null"); - } else if(array.length == 0) { - out.write("[]"); - } else { - out.write("["); - out.write(String.valueOf(array[0])); - - for(int i = 1; i < array.length; i++){ - out.write(","); - out.write(String.valueOf(array[i])); - } - - out.write("]"); - } - } - - public static String toJSONString(boolean[] array){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(array, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - public static void writeJSONString(char[] array, Writer out) throws IOException{ - if(array == null){ - out.write("null"); - } else if(array.length == 0) { - out.write("[]"); - } else { - out.write("[\""); - out.write(String.valueOf(array[0])); - - for(int i = 1; i < array.length; i++){ - out.write("\",\""); - out.write(String.valueOf(array[i])); - } - - out.write("\"]"); - } - } - - public static String toJSONString(char[] array){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(array, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - public static void writeJSONString(Object[] array, Writer out) throws IOException{ - if(array == null){ - out.write("null"); - } else if(array.length == 0) { - out.write("[]"); - } else { - out.write("["); - JSONValue.writeJSONString(array[0], out); - - for(int i = 1; i < array.length; i++){ - out.write(","); - JSONValue.writeJSONString(array[i], out); - } - - out.write("]"); - } - } - - public static String toJSONString(Object[] array){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(array, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - public String toJSONString(){ - return toJSONString(this); - } - - /** - * Returns a string representation of this array. This is equivalent to - * calling {@link JSONArray#toJSONString()}. - */ - public String toString() { - return toJSONString(); - } -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONAware.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONAware.java deleted file mode 100644 index 0b0a40b0..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONAware.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.json.simple; - -/** - * Beans that support customized output of JSON text shall implement this interface. - * @author FangYidong - */ -public interface JSONAware { - /** - * @return JSON text - */ - String toJSONString(); -} diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONObject.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONObject.java deleted file mode 100644 index 6ff3301e..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONObject.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * $Id: JSONObject.java,v 1.1 2006/04/15 14:10:48 platform Exp $ - * Created on 2006-4-10 - */ -package org.json.simple; - -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -/** - * A JSON object. Key value pairs are unordered. JSONObject supports java.util.Map interface. - * - * @author FangYidong - */ -public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAware{ - - private static final long serialVersionUID = -503443796854799292L; - - - public JSONObject() { - super(); - } - - /** - * Allows creation of a JSONObject from a Map. After that, both the - * generated JSONObject and the Map can be modified independently. - * - * @param map - */ - public JSONObject(Map map) { - super(map); - } - - - /** - * Encode a map into JSON text and write it to out. - * If this map is also a JSONAware or JSONStreamAware, JSONAware or JSONStreamAware specific behaviours will be ignored at this top level. - * - * @see org.json.simple.JSONValue#writeJSONString(Object, Writer) - * - * @param map - * @param out - */ - public static void writeJSONString(Map map, Writer out) throws IOException { - if(map == null){ - out.write("null"); - return; - } - - boolean first = true; - Iterator iter=map.entrySet().iterator(); - - out.write('{'); - while(iter.hasNext()){ - if(first) - first = false; - else - out.write(','); - Map.Entry entry=(Map.Entry)iter.next(); - out.write('\"'); - out.write(escape(String.valueOf(entry.getKey()))); - out.write('\"'); - out.write(':'); - JSONValue.writeJSONString(entry.getValue(), out); - } - out.write('}'); - } - - public void writeJSONString(Writer out) throws IOException{ - writeJSONString(this, out); - } - - /** - * Convert a map to JSON text. The result is a JSON object. - * If this map is also a JSONAware, JSONAware specific behaviours will be omitted at this top level. - * - * @see org.json.simple.JSONValue#toJSONString(Object) - * - * @param map - * @return JSON text, or "null" if map is null. - */ - public static String toJSONString(Map map){ - final StringWriter writer = new StringWriter(); - - try { - writeJSONString(map, writer); - return writer.toString(); - } catch (IOException e) { - // This should never happen with a StringWriter - throw new RuntimeException(e); - } - } - - public String toJSONString(){ - return toJSONString(this); - } - - public String toString(){ - return toJSONString(); - } - - public static String toString(String key,Object value){ - StringBuffer sb = new StringBuffer(); - sb.append('\"'); - if(key == null) - sb.append("null"); - else - JSONValue.escape(key, sb); - sb.append('\"').append(':'); - - sb.append(JSONValue.toJSONString(value)); - - return sb.toString(); - } - - /** - * Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F). - * It's the same as JSONValue.escape() only for compatibility here. - * - * @see org.json.simple.JSONValue#escape(String) - * - * @param s - * @return - */ - public static String escape(String s){ - return JSONValue.escape(s); - } -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONStreamAware.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONStreamAware.java deleted file mode 100644 index 5d01ebee..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONStreamAware.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.json.simple; - -import java.io.IOException; -import java.io.Writer; - -/** - * Beans that support customized output of JSON text to a writer shall implement this interface. - * @author FangYidong - */ -public interface JSONStreamAware { - /** - * write JSON string to out. - */ - void writeJSONString(Writer out) throws IOException; -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONValue.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONValue.java deleted file mode 100644 index fcbb1504..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/JSONValue.java +++ /dev/null @@ -1,316 +0,0 @@ -/* - * $Id: JSONValue.java,v 1.1 2006/04/15 14:37:04 platform Exp $ - * Created on 2006-4-15 - */ -package org.json.simple; - -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.Writer; -import java.util.Collection; -// import java.util.List; -import java.util.Map; - -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; - - -/** - * @author FangYidong - */ -public class JSONValue { - /** - * Parse JSON text into java object from the input source. - * Please use parseWithException() if you don't want to ignore the exception. - * - * @see org.json.simple.parser.JSONParser#parse(Reader) - * @see #parseWithException(Reader) - * - * @param in - * @return Instance of the following: - * org.json.simple.JSONObject, - * org.json.simple.JSONArray, - * java.lang.String, - * java.lang.Number, - * java.lang.Boolean, - * null - * - * @deprecated this method may throw an {@code Error} instead of returning - * {@code null}; please use {@link JSONValue#parseWithException(Reader)} - * instead - */ - public static Object parse(Reader in){ - try{ - JSONParser parser=new JSONParser(); - return parser.parse(in); - } - catch(Exception e){ - return null; - } - } - - /** - * Parse JSON text into java object from the given string. - * Please use parseWithException() if you don't want to ignore the exception. - * - * @see org.json.simple.parser.JSONParser#parse(Reader) - * @see #parseWithException(Reader) - * - * @param s - * @return Instance of the following: - * org.json.simple.JSONObject, - * org.json.simple.JSONArray, - * java.lang.String, - * java.lang.Number, - * java.lang.Boolean, - * null - * - * @deprecated this method may throw an {@code Error} instead of returning - * {@code null}; please use {@link JSONValue#parseWithException(String)} - * instead - */ - public static Object parse(String s){ - StringReader in=new StringReader(s); - return parse(in); - } - - /** - * Parse JSON text into java object from the input source. - * - * @see org.json.simple.parser.JSONParser - * - * @param in - * @return Instance of the following: - * org.json.simple.JSONObject, - * org.json.simple.JSONArray, - * java.lang.String, - * java.lang.Number, - * java.lang.Boolean, - * null - * - * @throws IOException - * @throws ParseException - */ - public static Object parseWithException(Reader in) throws IOException, ParseException{ - JSONParser parser=new JSONParser(); - return parser.parse(in); - } - - public static Object parseWithException(String s) throws ParseException{ - JSONParser parser=new JSONParser(); - return parser.parse(s); - } - - /** - * Encode an object into JSON text and write it to out. - *

- * If this object is a Map or a List, and it's also a JSONStreamAware or a JSONAware, JSONStreamAware or JSONAware will be considered firstly. - *

- * DO NOT call this method from writeJSONString(Writer) of a class that implements both JSONStreamAware and (Map or List) with - * "this" as the first parameter, use JSONObject.writeJSONString(Map, Writer) or JSONArray.writeJSONString(List, Writer) instead. - * - * @see org.json.simple.JSONObject#writeJSONString(Map, Writer) - * @see org.json.simple.JSONArray#writeJSONString(List, Writer) - * - * @param value - * @param writer - */ - public static void writeJSONString(Object value, Writer out) throws IOException { - if(value == null){ - out.write("null"); - return; - } - - if(value instanceof String){ - out.write('\"'); - out.write(escape((String)value)); - out.write('\"'); - return; - } - - if(value instanceof Double){ - if(((Double)value).isInfinite() || ((Double)value).isNaN()) - out.write("null"); - else - out.write(value.toString()); - return; - } - - if(value instanceof Float){ - if(((Float)value).isInfinite() || ((Float)value).isNaN()) - out.write("null"); - else - out.write(value.toString()); - return; - } - - if(value instanceof Number){ - out.write(value.toString()); - return; - } - - if(value instanceof Boolean){ - out.write(value.toString()); - return; - } - - if((value instanceof JSONStreamAware)){ - ((JSONStreamAware)value).writeJSONString(out); - return; - } - - if((value instanceof JSONAware)){ - out.write(((JSONAware)value).toJSONString()); - return; - } - - if(value instanceof Map){ - JSONObject.writeJSONString((Map)value, out); - return; - } - - if(value instanceof Collection){ - JSONArray.writeJSONString((Collection)value, out); - return; - } - - if(value instanceof byte[]){ - JSONArray.writeJSONString((byte[])value, out); - return; - } - - if(value instanceof short[]){ - JSONArray.writeJSONString((short[])value, out); - return; - } - - if(value instanceof int[]){ - JSONArray.writeJSONString((int[])value, out); - return; - } - - if(value instanceof long[]){ - JSONArray.writeJSONString((long[])value, out); - return; - } - - if(value instanceof float[]){ - JSONArray.writeJSONString((float[])value, out); - return; - } - - if(value instanceof double[]){ - JSONArray.writeJSONString((double[])value, out); - return; - } - - if(value instanceof boolean[]){ - JSONArray.writeJSONString((boolean[])value, out); - return; - } - - if(value instanceof char[]){ - JSONArray.writeJSONString((char[])value, out); - return; - } - - if(value instanceof Object[]){ - JSONArray.writeJSONString((Object[])value, out); - return; - } - - out.write(value.toString()); - } - - /** - * Convert an object to JSON text. - *

- * If this object is a Map or a List, and it's also a JSONAware, JSONAware will be considered firstly. - *

- * DO NOT call this method from toJSONString() of a class that implements both JSONAware and Map or List with - * "this" as the parameter, use JSONObject.toJSONString(Map) or JSONArray.toJSONString(List) instead. - * - * @see org.json.simple.JSONObject#toJSONString(Map) - * @see org.json.simple.JSONArray#toJSONString(List) - * - * @param value - * @return JSON text, or "null" if value is null or it's an NaN or an INF number. - */ - public static String toJSONString(Object value){ - final StringWriter writer = new StringWriter(); - - try{ - writeJSONString(value, writer); - return writer.toString(); - } catch(IOException e){ - // This should never happen for a StringWriter - throw new RuntimeException(e); - } - } - - /** - * Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F). - * @param s - * @return - */ - public static String escape(String s){ - if(s==null) - return null; - StringBuffer sb = new StringBuffer(); - escape(s, sb); - return sb.toString(); - } - - /** - * @param s - Must not be null. - * @param sb - */ - static void escape(String s, StringBuffer sb) { - final int len = s.length(); - for(int i=0;i='\u0000' && ch<='\u001F') || (ch>='\u007F' && ch<='\u009F') || (ch>='\u2000' && ch<='\u20FF')){ - String ss=Integer.toHexString(ch); - sb.append("\\u"); - for(int k=0;k<4-ss.length();k++){ - sb.append('0'); - } - sb.append(ss.toUpperCase()); - } - else{ - sb.append(ch); - } - } - }//for - } - -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ContainerFactory.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ContainerFactory.java deleted file mode 100644 index cacb6f19..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ContainerFactory.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.json.simple.parser; - -import java.util.List; -import java.util.Map; - -/** - * Container factory for creating containers for JSON object and JSON array. - * - * @see org.json.simple.parser.JSONParser#parse(java.io.Reader, ContainerFactory) - * - * @author FangYidong - */ -public interface ContainerFactory { - /** - * @return A Map instance to store JSON object, or null if you want to use org.json.simple.JSONObject. - */ - Map createObjectContainer(); - - /** - * @return A List instance to store JSON array, or null if you want to use org.json.simple.JSONArray. - */ - List creatArrayContainer(); -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ContentHandler.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ContentHandler.java deleted file mode 100644 index dc3be83d..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ContentHandler.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.json.simple.parser; - -import java.io.IOException; - -/** - * A simplified and stoppable SAX-like content handler for stream processing of JSON text. - * - * @see org.xml.sax.ContentHandler - * @see org.json.simple.parser.JSONParser#parse(java.io.Reader, ContentHandler, boolean) - * - * @author FangYidong - */ -public interface ContentHandler { - /** - * Receive notification of the beginning of JSON processing. - * The parser will invoke this method only once. - * - * @throws ParseException - * - JSONParser will stop and throw the same exception to the caller when receiving this exception. - */ - void startJSON() throws ParseException, IOException; - - /** - * Receive notification of the end of JSON processing. - * - * @throws ParseException - */ - void endJSON() throws ParseException, IOException; - - /** - * Receive notification of the beginning of a JSON object. - * - * @return false if the handler wants to stop parsing after return. - * @throws ParseException - * - JSONParser will stop and throw the same exception to the caller when receiving this exception. - * @see #endJSON - */ - boolean startObject() throws ParseException, IOException; - - /** - * Receive notification of the end of a JSON object. - * - * @return false if the handler wants to stop parsing after return. - * @throws ParseException - * - * @see #startObject - */ - boolean endObject() throws ParseException, IOException; - - /** - * Receive notification of the beginning of a JSON object entry. - * - * @param key - Key of a JSON object entry. - * - * @return false if the handler wants to stop parsing after return. - * @throws ParseException - * - * @see #endObjectEntry - */ - boolean startObjectEntry(String key) throws ParseException, IOException; - - /** - * Receive notification of the end of the value of previous object entry. - * - * @return false if the handler wants to stop parsing after return. - * @throws ParseException - * - * @see #startObjectEntry - */ - boolean endObjectEntry() throws ParseException, IOException; - - /** - * Receive notification of the beginning of a JSON array. - * - * @return false if the handler wants to stop parsing after return. - * @throws ParseException - * - * @see #endArray - */ - boolean startArray() throws ParseException, IOException; - - /** - * Receive notification of the end of a JSON array. - * - * @return false if the handler wants to stop parsing after return. - * @throws ParseException - * - * @see #startArray - */ - boolean endArray() throws ParseException, IOException; - - /** - * Receive notification of the JSON primitive values: - * java.lang.String, - * java.lang.Number, - * java.lang.Boolean - * null - * - * @param value - Instance of the following: - * java.lang.String, - * java.lang.Number, - * java.lang.Boolean - * null - * - * @return false if the handler wants to stop parsing after return. - * @throws ParseException - */ - boolean primitive(Object value) throws ParseException, IOException; - -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/JSONParser.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/JSONParser.java deleted file mode 100644 index 6d58770d..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/JSONParser.java +++ /dev/null @@ -1,533 +0,0 @@ -/* - * $Id: JSONParser.java,v 1.1 2006/04/15 14:10:48 platform Exp $ - * Created on 2006-4-15 - */ -package org.json.simple.parser; - -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; - - -/** - * Parser for JSON text. Please note that JSONParser is NOT thread-safe. - * - * @author FangYidong - */ -public class JSONParser { - public static final int S_INIT=0; - public static final int S_IN_FINISHED_VALUE=1;//string,number,boolean,null,object,array - public static final int S_IN_OBJECT=2; - public static final int S_IN_ARRAY=3; - public static final int S_PASSED_PAIR_KEY=4; - public static final int S_IN_PAIR_VALUE=5; - public static final int S_END=6; - public static final int S_IN_ERROR=-1; - - private LinkedList handlerStatusStack; - private Yylex lexer = new Yylex((Reader)null); - private Yytoken token = null; - private int status = S_INIT; - - private int peekStatus(LinkedList statusStack){ - if(statusStack.size()==0) - return -1; - Integer status=(Integer)statusStack.getFirst(); - return status.intValue(); - } - - /** - * Reset the parser to the initial state without resetting the underlying reader. - * - */ - public void reset(){ - token = null; - status = S_INIT; - handlerStatusStack = null; - } - - /** - * Reset the parser to the initial state with a new character reader. - * - * @param in - The new character reader. - * @throws IOException - * @throws ParseException - */ - public void reset(Reader in){ - lexer.yyreset(in); - reset(); - } - - /** - * @return The position of the beginning of the current token. - */ - public int getPosition(){ - return lexer.getPosition(); - } - - public Object parse(String s) throws ParseException{ - return parse(s, (ContainerFactory)null); - } - - public Object parse(String s, ContainerFactory containerFactory) throws ParseException{ - StringReader in=new StringReader(s); - try{ - return parse(in, containerFactory); - } - catch(IOException ie){ - /* - * Actually it will never happen. - */ - throw new ParseException(-1, ParseException.ERROR_UNEXPECTED_EXCEPTION, ie); - } - } - - public Object parse(Reader in) throws IOException, ParseException{ - return parse(in, (ContainerFactory)null); - } - - /** - * Parse JSON text into java object from the input source. - * - * @param in - * @param containerFactory - Use this factory to createyour own JSON object and JSON array containers. - * @return Instance of the following: - * org.json.simple.JSONObject, - * org.json.simple.JSONArray, - * java.lang.String, - * java.lang.Number, - * java.lang.Boolean, - * null - * - * @throws IOException - * @throws ParseException - */ - public Object parse(Reader in, ContainerFactory containerFactory) throws IOException, ParseException{ - reset(in); - LinkedList statusStack = new LinkedList(); - LinkedList valueStack = new LinkedList(); - - try{ - do{ - nextToken(); - switch(status){ - case S_INIT: - switch(token.type){ - case Yytoken.TYPE_VALUE: - status=S_IN_FINISHED_VALUE; - statusStack.addFirst(new Integer(status)); - valueStack.addFirst(token.value); - break; - case Yytoken.TYPE_LEFT_BRACE: - status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); - valueStack.addFirst(createObjectContainer(containerFactory)); - break; - case Yytoken.TYPE_LEFT_SQUARE: - status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); - valueStack.addFirst(createArrayContainer(containerFactory)); - break; - default: - status=S_IN_ERROR; - }//inner switch - break; - - case S_IN_FINISHED_VALUE: - if(token.type==Yytoken.TYPE_EOF) - return valueStack.removeFirst(); - else - throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); - - case S_IN_OBJECT: - switch(token.type){ - case Yytoken.TYPE_COMMA: - break; - case Yytoken.TYPE_VALUE: - if(token.value instanceof String){ - String key=(String)token.value; - valueStack.addFirst(key); - status=S_PASSED_PAIR_KEY; - statusStack.addFirst(new Integer(status)); - } - else{ - status=S_IN_ERROR; - } - break; - case Yytoken.TYPE_RIGHT_BRACE: - if(valueStack.size()>1){ - statusStack.removeFirst(); - valueStack.removeFirst(); - status=peekStatus(statusStack); - } - else{ - status=S_IN_FINISHED_VALUE; - } - break; - default: - status=S_IN_ERROR; - break; - }//inner switch - break; - - case S_PASSED_PAIR_KEY: - switch(token.type){ - case Yytoken.TYPE_COLON: - break; - case Yytoken.TYPE_VALUE: - statusStack.removeFirst(); - String key=(String)valueStack.removeFirst(); - Map parent=(Map)valueStack.getFirst(); - parent.put(key,token.value); - status=peekStatus(statusStack); - break; - case Yytoken.TYPE_LEFT_SQUARE: - statusStack.removeFirst(); - key=(String)valueStack.removeFirst(); - parent=(Map)valueStack.getFirst(); - List newArray=createArrayContainer(containerFactory); - parent.put(key,newArray); - status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); - valueStack.addFirst(newArray); - break; - case Yytoken.TYPE_LEFT_BRACE: - statusStack.removeFirst(); - key=(String)valueStack.removeFirst(); - parent=(Map)valueStack.getFirst(); - Map newObject=createObjectContainer(containerFactory); - parent.put(key,newObject); - status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); - valueStack.addFirst(newObject); - break; - default: - status=S_IN_ERROR; - } - break; - - case S_IN_ARRAY: - switch(token.type){ - case Yytoken.TYPE_COMMA: - break; - case Yytoken.TYPE_VALUE: - List val=(List)valueStack.getFirst(); - val.add(token.value); - break; - case Yytoken.TYPE_RIGHT_SQUARE: - if(valueStack.size()>1){ - statusStack.removeFirst(); - valueStack.removeFirst(); - status=peekStatus(statusStack); - } - else{ - status=S_IN_FINISHED_VALUE; - } - break; - case Yytoken.TYPE_LEFT_BRACE: - val=(List)valueStack.getFirst(); - Map newObject=createObjectContainer(containerFactory); - val.add(newObject); - status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); - valueStack.addFirst(newObject); - break; - case Yytoken.TYPE_LEFT_SQUARE: - val=(List)valueStack.getFirst(); - List newArray=createArrayContainer(containerFactory); - val.add(newArray); - status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); - valueStack.addFirst(newArray); - break; - default: - status=S_IN_ERROR; - }//inner switch - break; - case S_IN_ERROR: - throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); - }//switch - if(status==S_IN_ERROR){ - throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); - } - }while(token.type!=Yytoken.TYPE_EOF); - } - catch(IOException ie){ - throw ie; - } - - throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); - } - - private void nextToken() throws ParseException, IOException{ - token = lexer.yylex(); - if(token == null) - token = new Yytoken(Yytoken.TYPE_EOF, null); - } - - private Map createObjectContainer(ContainerFactory containerFactory){ - if(containerFactory == null) - return new JSONObject(); - Map m = containerFactory.createObjectContainer(); - - if(m == null) - return new JSONObject(); - return m; - } - - private List createArrayContainer(ContainerFactory containerFactory){ - if(containerFactory == null) - return new JSONArray(); - List l = containerFactory.creatArrayContainer(); - - if(l == null) - return new JSONArray(); - return l; - } - - public void parse(String s, ContentHandler contentHandler) throws ParseException{ - parse(s, contentHandler, false); - } - - public void parse(String s, ContentHandler contentHandler, boolean isResume) throws ParseException{ - StringReader in=new StringReader(s); - try{ - parse(in, contentHandler, isResume); - } - catch(IOException ie){ - /* - * Actually it will never happen. - */ - throw new ParseException(-1, ParseException.ERROR_UNEXPECTED_EXCEPTION, ie); - } - } - - public void parse(Reader in, ContentHandler contentHandler) throws IOException, ParseException{ - parse(in, contentHandler, false); - } - - /** - * Stream processing of JSON text. - * - * @see ContentHandler - * - * @param in - * @param contentHandler - * @param isResume - Indicates if it continues previous parsing operation. - * If set to true, resume parsing the old stream, and parameter 'in' will be ignored. - * If this method is called for the first time in this instance, isResume will be ignored. - * - * @throws IOException - * @throws ParseException - */ - public void parse(Reader in, ContentHandler contentHandler, boolean isResume) throws IOException, ParseException{ - if(!isResume){ - reset(in); - handlerStatusStack = new LinkedList(); - } - else{ - if(handlerStatusStack == null){ - isResume = false; - reset(in); - handlerStatusStack = new LinkedList(); - } - } - - LinkedList statusStack = handlerStatusStack; - - try{ - do{ - switch(status){ - case S_INIT: - contentHandler.startJSON(); - nextToken(); - switch(token.type){ - case Yytoken.TYPE_VALUE: - status=S_IN_FINISHED_VALUE; - statusStack.addFirst(new Integer(status)); - if(!contentHandler.primitive(token.value)) - return; - break; - case Yytoken.TYPE_LEFT_BRACE: - status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); - if(!contentHandler.startObject()) - return; - break; - case Yytoken.TYPE_LEFT_SQUARE: - status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); - if(!contentHandler.startArray()) - return; - break; - default: - status=S_IN_ERROR; - }//inner switch - break; - - case S_IN_FINISHED_VALUE: - nextToken(); - if(token.type==Yytoken.TYPE_EOF){ - contentHandler.endJSON(); - status = S_END; - return; - } - else{ - status = S_IN_ERROR; - throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); - } - - case S_IN_OBJECT: - nextToken(); - switch(token.type){ - case Yytoken.TYPE_COMMA: - break; - case Yytoken.TYPE_VALUE: - if(token.value instanceof String){ - String key=(String)token.value; - status=S_PASSED_PAIR_KEY; - statusStack.addFirst(new Integer(status)); - if(!contentHandler.startObjectEntry(key)) - return; - } - else{ - status=S_IN_ERROR; - } - break; - case Yytoken.TYPE_RIGHT_BRACE: - if(statusStack.size()>1){ - statusStack.removeFirst(); - status=peekStatus(statusStack); - } - else{ - status=S_IN_FINISHED_VALUE; - } - if(!contentHandler.endObject()) - return; - break; - default: - status=S_IN_ERROR; - break; - }//inner switch - break; - - case S_PASSED_PAIR_KEY: - nextToken(); - switch(token.type){ - case Yytoken.TYPE_COLON: - break; - case Yytoken.TYPE_VALUE: - statusStack.removeFirst(); - status=peekStatus(statusStack); - if(!contentHandler.primitive(token.value)) - return; - if(!contentHandler.endObjectEntry()) - return; - break; - case Yytoken.TYPE_LEFT_SQUARE: - statusStack.removeFirst(); - statusStack.addFirst(new Integer(S_IN_PAIR_VALUE)); - status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); - if(!contentHandler.startArray()) - return; - break; - case Yytoken.TYPE_LEFT_BRACE: - statusStack.removeFirst(); - statusStack.addFirst(new Integer(S_IN_PAIR_VALUE)); - status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); - if(!contentHandler.startObject()) - return; - break; - default: - status=S_IN_ERROR; - } - break; - - case S_IN_PAIR_VALUE: - /* - * S_IN_PAIR_VALUE is just a marker to indicate the end of an object entry, it doesn't proccess any token, - * therefore delay consuming token until next round. - */ - statusStack.removeFirst(); - status = peekStatus(statusStack); - if(!contentHandler.endObjectEntry()) - return; - break; - - case S_IN_ARRAY: - nextToken(); - switch(token.type){ - case Yytoken.TYPE_COMMA: - break; - case Yytoken.TYPE_VALUE: - if(!contentHandler.primitive(token.value)) - return; - break; - case Yytoken.TYPE_RIGHT_SQUARE: - if(statusStack.size()>1){ - statusStack.removeFirst(); - status=peekStatus(statusStack); - } - else{ - status=S_IN_FINISHED_VALUE; - } - if(!contentHandler.endArray()) - return; - break; - case Yytoken.TYPE_LEFT_BRACE: - status=S_IN_OBJECT; - statusStack.addFirst(new Integer(status)); - if(!contentHandler.startObject()) - return; - break; - case Yytoken.TYPE_LEFT_SQUARE: - status=S_IN_ARRAY; - statusStack.addFirst(new Integer(status)); - if(!contentHandler.startArray()) - return; - break; - default: - status=S_IN_ERROR; - }//inner switch - break; - - case S_END: - return; - - case S_IN_ERROR: - throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); - }//switch - if(status==S_IN_ERROR){ - throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); - } - }while(token.type!=Yytoken.TYPE_EOF); - } - catch(IOException ie){ - status = S_IN_ERROR; - throw ie; - } - catch(ParseException pe){ - status = S_IN_ERROR; - throw pe; - } - catch(RuntimeException re){ - status = S_IN_ERROR; - throw re; - } - catch(Error e){ - status = S_IN_ERROR; - throw e; - } - - status = S_IN_ERROR; - throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); - } -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ParseException.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ParseException.java deleted file mode 100644 index 44985bbe..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/ParseException.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.json.simple.parser; - -/** - * ParseException explains why and where the error occurs in source JSON text. - * - * @author FangYidong - * - */ -public class ParseException extends Exception { - private static final long serialVersionUID = -7880698968187728547L; - - public static final int ERROR_UNEXPECTED_CHAR = 0; - public static final int ERROR_UNEXPECTED_TOKEN = 1; - public static final int ERROR_UNEXPECTED_EXCEPTION = 2; - - private int errorType; - private Object unexpectedObject; - private int position; - - public ParseException(int errorType){ - this(-1, errorType, null); - } - - public ParseException(int errorType, Object unexpectedObject){ - this(-1, errorType, unexpectedObject); - } - - public ParseException(int position, int errorType, Object unexpectedObject){ - this.position = position; - this.errorType = errorType; - this.unexpectedObject = unexpectedObject; - } - - public int getErrorType() { - return errorType; - } - - public void setErrorType(int errorType) { - this.errorType = errorType; - } - - /** - * @see org.json.simple.parser.JSONParser#getPosition() - * - * @return The character position (starting with 0) of the input where the error occurs. - */ - public int getPosition() { - return position; - } - - public void setPosition(int position) { - this.position = position; - } - - /** - * @see org.json.simple.parser.Yytoken - * - * @return One of the following base on the value of errorType: - * ERROR_UNEXPECTED_CHAR java.lang.Character - * ERROR_UNEXPECTED_TOKEN org.json.simple.parser.Yytoken - * ERROR_UNEXPECTED_EXCEPTION java.lang.Exception - */ - public Object getUnexpectedObject() { - return unexpectedObject; - } - - public void setUnexpectedObject(Object unexpectedObject) { - this.unexpectedObject = unexpectedObject; - } - - public String getMessage() { - StringBuffer sb = new StringBuffer(); - - switch(errorType){ - case ERROR_UNEXPECTED_CHAR: - sb.append("Unexpected character (").append(unexpectedObject).append(") at position ").append(position).append("."); - break; - case ERROR_UNEXPECTED_TOKEN: - sb.append("Unexpected token ").append(unexpectedObject).append(" at position ").append(position).append("."); - break; - case ERROR_UNEXPECTED_EXCEPTION: - sb.append("Unexpected exception at position ").append(position).append(": ").append(unexpectedObject); - break; - default: - sb.append("Unkown error at position ").append(position).append("."); - break; - } - return sb.toString(); - } -} diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/Yylex.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/Yylex.java deleted file mode 100644 index 28303a74..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/Yylex.java +++ /dev/null @@ -1,688 +0,0 @@ -/* The following code was generated by JFlex 1.4.2 */ - -package org.json.simple.parser; - -class Yylex { - - /** This character denotes the end of file */ - public static final int YYEOF = -1; - - /** initial size of the lookahead buffer */ - private static final int ZZ_BUFFERSIZE = 16384; - - /** lexical states */ - public static final int YYINITIAL = 0; - public static final int STRING_BEGIN = 2; - - /** - * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l - * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l - * at the beginning of a line - * l is of the form l = 2*k, k a non negative integer - */ - private static final int ZZ_LEXSTATE[] = { - 0, 0, 1, 1 - }; - - /** - * Translates characters to character classes - */ - private static final String ZZ_CMAP_PACKED = - "\11\0\1\7\1\7\2\0\1\7\22\0\1\7\1\0\1\11\10\0"+ - "\1\6\1\31\1\2\1\4\1\12\12\3\1\32\6\0\4\1\1\5"+ - "\1\1\24\0\1\27\1\10\1\30\3\0\1\22\1\13\2\1\1\21"+ - "\1\14\5\0\1\23\1\0\1\15\3\0\1\16\1\24\1\17\1\20"+ - "\5\0\1\25\1\0\1\26\uff82\0"; - - /** - * Translates characters to character classes - */ - private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); - - /** - * Translates DFA states to action switch labels. - */ - private static final int [] ZZ_ACTION = zzUnpackAction(); - - private static final String ZZ_ACTION_PACKED_0 = - "\2\0\2\1\1\2\1\3\1\4\3\1\1\5\1\6"+ - "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\5\0"+ - "\1\14\1\16\1\17\1\20\1\21\1\22\1\23\1\24"+ - "\1\0\1\25\1\0\1\25\4\0\1\26\1\27\2\0"+ - "\1\30"; - - private static int [] zzUnpackAction() { - int [] result = new int[45]; - int offset = 0; - offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackAction(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; - } - - - /** - * Translates a state to a row index in the transition table - */ - private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); - - private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\33\0\66\0\121\0\154\0\207\0\66\0\242"+ - "\0\275\0\330\0\66\0\66\0\66\0\66\0\66\0\66"+ - "\0\363\0\u010e\0\66\0\u0129\0\u0144\0\u015f\0\u017a\0\u0195"+ - "\0\66\0\66\0\66\0\66\0\66\0\66\0\66\0\66"+ - "\0\u01b0\0\u01cb\0\u01e6\0\u01e6\0\u0201\0\u021c\0\u0237\0\u0252"+ - "\0\66\0\66\0\u026d\0\u0288\0\66"; - - private static int [] zzUnpackRowMap() { - int [] result = new int[45]; - int offset = 0; - offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackRowMap(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int high = packed.charAt(i++) << 16; - result[j++] = high | packed.charAt(i++); - } - return j; - } - - /** - * The transition table of the DFA - */ - private static final int ZZ_TRANS [] = { - 2, 2, 3, 4, 2, 2, 2, 5, 2, 6, - 2, 2, 7, 8, 2, 9, 2, 2, 2, 2, - 2, 10, 11, 12, 13, 14, 15, 16, 16, 16, - 16, 16, 16, 16, 16, 17, 18, 16, 16, 16, - 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 16, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 4, 19, 20, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 20, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 5, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 21, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 23, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 16, 16, 16, 16, 16, 16, 16, - 16, -1, -1, 16, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, - -1, -1, -1, -1, -1, -1, -1, -1, 24, 25, - 26, 27, 28, 29, 30, 31, 32, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 33, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 34, 35, -1, -1, - 34, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 37, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 39, -1, 39, -1, 39, -1, -1, - -1, -1, -1, 39, 39, -1, -1, -1, -1, 39, - 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 33, -1, 20, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 35, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 38, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 40, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, 42, -1, 42, - -1, -1, -1, -1, -1, 42, 42, -1, -1, -1, - -1, 42, 42, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 43, -1, 43, -1, 43, -1, -1, -1, - -1, -1, 43, 43, -1, -1, -1, -1, 43, 43, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, - -1, 44, -1, 44, -1, -1, -1, -1, -1, 44, - 44, -1, -1, -1, -1, 44, 44, -1, -1, -1, - -1, -1, -1, -1, -1, - }; - - /* error codes */ - private static final int ZZ_UNKNOWN_ERROR = 0; - private static final int ZZ_NO_MATCH = 1; - private static final int ZZ_PUSHBACK_2BIG = 2; - - /* error messages for the codes above */ - private static final String ZZ_ERROR_MSG[] = { - "Unkown internal scanner error", - "Error: could not match input", - "Error: pushback value was too large" - }; - - /** - * ZZ_ATTRIBUTE[aState] contains the attributes of state aState - */ - private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); - - private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\2\0\1\11\3\1\1\11\3\1\6\11\2\1\1\11"+ - "\5\0\10\11\1\0\1\1\1\0\1\1\4\0\2\11"+ - "\2\0\1\11"; - - private static int [] zzUnpackAttribute() { - int [] result = new int[45]; - int offset = 0; - offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackAttribute(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; - } - - /** the input device */ - private java.io.Reader zzReader; - - /** the current state of the DFA */ - private int zzState; - - /** the current lexical state */ - private int zzLexicalState = YYINITIAL; - - /** this buffer contains the current text to be matched and is - the source of the yytext() string */ - private char zzBuffer[] = new char[ZZ_BUFFERSIZE]; - - /** the textposition at the last accepting state */ - private int zzMarkedPos; - - /** the current text position in the buffer */ - private int zzCurrentPos; - - /** startRead marks the beginning of the yytext() string in the buffer */ - private int zzStartRead; - - /** endRead marks the last character in the buffer, that has been read - from input */ - private int zzEndRead; - - /** number of newlines encountered up to the start of the matched text */ - private int yyline; - - /** the number of characters up to the start of the matched text */ - private int yychar; - - /** - * the number of characters from the last newline up to the start of the - * matched text - */ - private int yycolumn; - - /** - * zzAtBOL == true <=> the scanner is currently at the beginning of a line - */ - private boolean zzAtBOL = true; - - /** zzAtEOF == true <=> the scanner is at the EOF */ - private boolean zzAtEOF; - - /* user code: */ -private StringBuffer sb=new StringBuffer(); - -int getPosition(){ - return yychar; -} - - - - /** - * Creates a new scanner - * There is also a java.io.InputStream version of this constructor. - * - * @param in the java.io.Reader to read input from. - */ - Yylex(java.io.Reader in) { - this.zzReader = in; - } - - /** - * Creates a new scanner. - * There is also java.io.Reader version of this constructor. - * - * @param in the java.io.Inputstream to read input from. - */ - Yylex(java.io.InputStream in) { - this(new java.io.InputStreamReader(in)); - } - - /** - * Unpacks the compressed character translation table. - * - * @param packed the packed character translation table - * @return the unpacked character translation table - */ - private static char [] zzUnpackCMap(String packed) { - char [] map = new char[0x10000]; - int i = 0; /* index in packed string */ - int j = 0; /* index in unpacked array */ - while (i < 90) { - int count = packed.charAt(i++); - char value = packed.charAt(i++); - do map[j++] = value; while (--count > 0); - } - return map; - } - - - /** - * Refills the input buffer. - * - * @return false, iff there was new input. - * - * @exception java.io.IOException if any I/O-Error occurs - */ - private boolean zzRefill() throws java.io.IOException { - - /* first: make room (if you can) */ - if (zzStartRead > 0) { - System.arraycopy(zzBuffer, zzStartRead, - zzBuffer, 0, - zzEndRead-zzStartRead); - - /* translate stored positions */ - zzEndRead-= zzStartRead; - zzCurrentPos-= zzStartRead; - zzMarkedPos-= zzStartRead; - zzStartRead = 0; - } - - /* is the buffer big enough? */ - if (zzCurrentPos >= zzBuffer.length) { - /* if not: blow it up */ - char newBuffer[] = new char[zzCurrentPos*2]; - System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length); - zzBuffer = newBuffer; - } - - /* finally: fill the buffer with new input */ - int numRead = zzReader.read(zzBuffer, zzEndRead, - zzBuffer.length-zzEndRead); - - if (numRead > 0) { - zzEndRead+= numRead; - return false; - } - // unlikely but not impossible: read 0 characters, but not at end of stream - if (numRead == 0) { - int c = zzReader.read(); - if (c == -1) { - return true; - } else { - zzBuffer[zzEndRead++] = (char) c; - return false; - } - } - - // numRead < 0 - return true; - } - - - /** - * Closes the input stream. - */ - public final void yyclose() throws java.io.IOException { - zzAtEOF = true; /* indicate end of file */ - zzEndRead = zzStartRead; /* invalidate buffer */ - - if (zzReader != null) - zzReader.close(); - } - - - /** - * Resets the scanner to read from a new input stream. - * Does not close the old reader. - * - * All internal variables are reset, the old input stream - * cannot be reused (internal buffer is discarded and lost). - * Lexical state is set to ZZ_INITIAL. - * - * @param reader the new input stream - */ - public final void yyreset(java.io.Reader reader) { - zzReader = reader; - zzAtBOL = true; - zzAtEOF = false; - zzEndRead = zzStartRead = 0; - zzCurrentPos = zzMarkedPos = 0; - yyline = yychar = yycolumn = 0; - zzLexicalState = YYINITIAL; - } - - - /** - * Returns the current lexical state. - */ - public final int yystate() { - return zzLexicalState; - } - - - /** - * Enters a new lexical state - * - * @param newState the new lexical state - */ - public final void yybegin(int newState) { - zzLexicalState = newState; - } - - - /** - * Returns the text matched by the current regular expression. - */ - public final String yytext() { - return new String( zzBuffer, zzStartRead, zzMarkedPos-zzStartRead ); - } - - - /** - * Returns the character at position pos from the - * matched text. - * - * It is equivalent to yytext().charAt(pos), but faster - * - * @param pos the position of the character to fetch. - * A value from 0 to yylength()-1. - * - * @return the character at position pos - */ - public final char yycharat(int pos) { - return zzBuffer[zzStartRead+pos]; - } - - - /** - * Returns the length of the matched text region. - */ - public final int yylength() { - return zzMarkedPos-zzStartRead; - } - - - /** - * Reports an error that occured while scanning. - * - * In a wellformed scanner (no or only correct usage of - * yypushback(int) and a match-all fallback rule) this method - * will only be called with things that "Can't Possibly Happen". - * If this method is called, something is seriously wrong - * (e.g. a JFlex bug producing a faulty scanner etc.). - * - * Usual syntax/scanner level error handling should be done - * in error fallback rules. - * - * @param errorCode the code of the errormessage to display - */ - private void zzScanError(int errorCode) { - String message; - try { - message = ZZ_ERROR_MSG[errorCode]; - } - catch (ArrayIndexOutOfBoundsException e) { - message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; - } - - throw new Error(message); - } - - - /** - * Pushes the specified amount of characters back into the input stream. - * - * They will be read again by then next call of the scanning method - * - * @param number the number of characters to be read again. - * This number must not be greater than yylength()! - */ - public void yypushback(int number) { - if ( number > yylength() ) - zzScanError(ZZ_PUSHBACK_2BIG); - - zzMarkedPos -= number; - } - - - /** - * Resumes scanning until the next regular expression is matched, - * the end of input is encountered or an I/O-Error occurs. - * - * @return the next token - * @exception java.io.IOException if any I/O-Error occurs - */ - public Yytoken yylex() throws java.io.IOException, ParseException { - int zzInput; - int zzAction; - - // cached fields: - int zzCurrentPosL; - int zzMarkedPosL; - int zzEndReadL = zzEndRead; - char [] zzBufferL = zzBuffer; - char [] zzCMapL = ZZ_CMAP; - - int [] zzTransL = ZZ_TRANS; - int [] zzRowMapL = ZZ_ROWMAP; - int [] zzAttrL = ZZ_ATTRIBUTE; - - while (true) { - zzMarkedPosL = zzMarkedPos; - - yychar+= zzMarkedPosL-zzStartRead; - - zzAction = -1; - - zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; - - zzState = ZZ_LEXSTATE[zzLexicalState]; - - - zzForAction: { - while (true) { - - if (zzCurrentPosL < zzEndReadL) - zzInput = zzBufferL[zzCurrentPosL++]; - else if (zzAtEOF) { - zzInput = YYEOF; - break zzForAction; - } - else { - // store back cached positions - zzCurrentPos = zzCurrentPosL; - zzMarkedPos = zzMarkedPosL; - boolean eof = zzRefill(); - // get translated positions and possibly new buffer - zzCurrentPosL = zzCurrentPos; - zzMarkedPosL = zzMarkedPos; - zzBufferL = zzBuffer; - zzEndReadL = zzEndRead; - if (eof) { - zzInput = YYEOF; - break zzForAction; - } - else { - zzInput = zzBufferL[zzCurrentPosL++]; - } - } - int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ]; - if (zzNext == -1) break zzForAction; - zzState = zzNext; - - int zzAttributes = zzAttrL[zzState]; - if ( (zzAttributes & 1) == 1 ) { - zzAction = zzState; - zzMarkedPosL = zzCurrentPosL; - if ( (zzAttributes & 8) == 8 ) break zzForAction; - } - - } - } - - // store back cached position - zzMarkedPos = zzMarkedPosL; - - switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { - case 11: - { sb.append(yytext()); - } - case 25: break; - case 4: - { sb = null; sb = new StringBuffer(); yybegin(STRING_BEGIN); - } - case 26: break; - case 16: - { sb.append('\b'); - } - case 27: break; - case 6: - { return new Yytoken(Yytoken.TYPE_RIGHT_BRACE,null); - } - case 28: break; - case 23: - { Boolean val=Boolean.valueOf(yytext()); return new Yytoken(Yytoken.TYPE_VALUE, val); - } - case 29: break; - case 22: - { return new Yytoken(Yytoken.TYPE_VALUE, null); - } - case 30: break; - case 13: - { yybegin(YYINITIAL);return new Yytoken(Yytoken.TYPE_VALUE, sb.toString()); - } - case 31: break; - case 12: - { sb.append('\\'); - } - case 32: break; - case 21: - { Double val=Double.valueOf(yytext()); return new Yytoken(Yytoken.TYPE_VALUE, val); - } - case 33: break; - case 1: - { throw new ParseException(yychar, ParseException.ERROR_UNEXPECTED_CHAR, new Character(yycharat(0))); - } - case 34: break; - case 8: - { return new Yytoken(Yytoken.TYPE_RIGHT_SQUARE,null); - } - case 35: break; - case 19: - { sb.append('\r'); - } - case 36: break; - case 15: - { sb.append('/'); - } - case 37: break; - case 10: - { return new Yytoken(Yytoken.TYPE_COLON,null); - } - case 38: break; - case 14: - { sb.append('"'); - } - case 39: break; - case 5: - { return new Yytoken(Yytoken.TYPE_LEFT_BRACE,null); - } - case 40: break; - case 17: - { sb.append('\f'); - } - case 41: break; - case 24: - { try{ - int ch=Integer.parseInt(yytext().substring(2),16); - sb.append((char)ch); - } - catch(Exception e){ - throw new ParseException(yychar, ParseException.ERROR_UNEXPECTED_EXCEPTION, e); - } - } - case 42: break; - case 20: - { sb.append('\t'); - } - case 43: break; - case 7: - { return new Yytoken(Yytoken.TYPE_LEFT_SQUARE,null); - } - case 44: break; - case 2: - { Long val=Long.valueOf(yytext()); return new Yytoken(Yytoken.TYPE_VALUE, val); - } - case 45: break; - case 18: - { sb.append('\n'); - } - case 46: break; - case 9: - { return new Yytoken(Yytoken.TYPE_COMMA,null); - } - case 47: break; - case 3: - { - } - case 48: break; - default: - if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { - zzAtEOF = true; - return null; - } - else { - zzScanError(ZZ_NO_MATCH); - } - } - } - } - - -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/Yytoken.java b/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/Yytoken.java deleted file mode 100644 index e4ec2ffe..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/src/org/json/simple/parser/Yytoken.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * $Id: Yytoken.java,v 1.1 2006/04/15 14:10:48 platform Exp $ - * Created on 2006-4-15 - */ -package org.json.simple.parser; - -/** - * @author FangYidong - */ -public class Yytoken { - public static final int TYPE_VALUE=0;//JSON primitive value: string,number,boolean,null - public static final int TYPE_LEFT_BRACE=1; - public static final int TYPE_RIGHT_BRACE=2; - public static final int TYPE_LEFT_SQUARE=3; - public static final int TYPE_RIGHT_SQUARE=4; - public static final int TYPE_COMMA=5; - public static final int TYPE_COLON=6; - public static final int TYPE_EOF=-1;//end of file - - public int type=0; - public Object value=null; - - public Yytoken(int type,Object value){ - this.type=type; - this.value=value; - } - - public String toString(){ - StringBuffer sb = new StringBuffer(); - switch(type){ - case TYPE_VALUE: - sb.append("VALUE(").append(value).append(")"); - break; - case TYPE_LEFT_BRACE: - sb.append("LEFT BRACE({)"); - break; - case TYPE_RIGHT_BRACE: - sb.append("RIGHT BRACE(})"); - break; - case TYPE_LEFT_SQUARE: - sb.append("LEFT SQUARE([)"); - break; - case TYPE_RIGHT_SQUARE: - sb.append("RIGHT SQUARE(])"); - break; - case TYPE_COMMA: - sb.append("COMMA(,)"); - break; - case TYPE_COLON: - sb.append("COLON(:)"); - break; - case TYPE_EOF: - sb.append("END OF FILE"); - break; - } - return sb.toString(); - } -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/test/com/connsec/desktop/login/TestJson.java b/maxkey-protocols/maxkey-protocol-simulate/test/com/connsec/desktop/login/TestJson.java deleted file mode 100644 index 0981ebee..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/test/com/connsec/desktop/login/TestJson.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.connsec.desktop.login; - -import org.json.simple.JSONObject; -import org.json.simple.JSONValue; - -public class TestJson { - - /** - * @param args - */ - public static void main(String[] args) { - // TODO Auto-generated method stub - - String json = "{"; - json += "\"name\":\"some name\","; - json += " \"description\":\"some description\","; - json += " \"doOnMonth\":11,"; - json += " \"doOnDay\":13,"; - json += " \"doOnYear\":2007"; - json += "}"; - Object obj=JSONValue.parse(json); - JSONObject obj2=(JSONObject)obj; - System.out.println(obj2.get("description")); - - String key="key"; - System.out.println(key.charAt(0)); - - } - -} diff --git a/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/JSONArrayTest.java b/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/JSONArrayTest.java deleted file mode 100644 index b6dc0fc8..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/JSONArrayTest.java +++ /dev/null @@ -1,288 +0,0 @@ -package org.json.simple; - -import java.io.IOException; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.HashSet; - -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; - -import junit.framework.TestCase; - -public class JSONArrayTest extends TestCase { - - public void testJSONArray() { - final JSONArray jsonArray = new JSONArray(); - - assertEquals("[]", jsonArray.toJSONString()); - } - - public void testJSONArrayCollection() { - final ArrayList testList = new ArrayList(); - testList.add("First item"); - testList.add("Second item"); - - final JSONArray jsonArray = new JSONArray(testList); - - assertEquals("[\"First item\",\"Second item\"]", jsonArray.toJSONString()); - } - - public void testWriteJSONStringCollectionWriter() throws IOException, ParseException { - final HashSet testSet = new HashSet(); - testSet.add("First item"); - testSet.add("Second item"); - - final JSONArray jsonArray = new JSONArray(testSet); - final StringWriter writer = new StringWriter(); - - jsonArray.writeJSONString(writer); - - final JSONParser parser = new JSONParser(); - final JSONArray parsedArray = (JSONArray)parser.parse(writer.toString()); - - assertTrue(parsedArray.containsAll(jsonArray)); - assertTrue(jsonArray.containsAll(parsedArray)); - assertEquals(2, jsonArray.size()); - } - - public void testToJSONStringCollection() throws ParseException { - final HashSet testSet = new HashSet(); - testSet.add("First item"); - testSet.add("Second item"); - - final JSONArray jsonArray = new JSONArray(testSet); - - final JSONParser parser = new JSONParser(); - final JSONArray parsedArray = (JSONArray)parser.parse(jsonArray.toJSONString()); - - assertTrue(parsedArray.containsAll(jsonArray)); - assertTrue(jsonArray.containsAll(parsedArray)); - assertEquals(2, jsonArray.size()); - } - - public void testByteArrayToString() throws IOException { - assertEquals("null", JSONArray.toJSONString((byte[])null)); - assertEquals("[]", JSONArray.toJSONString(new byte[0])); - assertEquals("[12]", JSONArray.toJSONString(new byte[] { 12 })); - assertEquals("[-7,22,86,-99]", JSONArray.toJSONString(new byte[] { -7, 22, 86, -99 })); - - StringWriter writer; - - writer = new StringWriter(); - JSONArray.writeJSONString((byte[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new byte[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new byte[] { 12 }, writer); - assertEquals("[12]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new byte[] { -7, 22, 86, -99 }, writer); - assertEquals("[-7,22,86,-99]", writer.toString()); - } - - public void testShortArrayToString() throws IOException { - assertEquals("null", JSONArray.toJSONString((short[])null)); - assertEquals("[]", JSONArray.toJSONString(new short[0])); - assertEquals("[12]", JSONArray.toJSONString(new short[] { 12 })); - assertEquals("[-7,22,86,-99]", JSONArray.toJSONString(new short[] { -7, 22, 86, -99 })); - - StringWriter writer; - - writer = new StringWriter(); - JSONArray.writeJSONString((short[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new short[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new short[] { 12 }, writer); - assertEquals("[12]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new short[] { -7, 22, 86, -99 }, writer); - assertEquals("[-7,22,86,-99]", writer.toString()); - } - - public void testIntArrayToString() throws IOException { - assertEquals("null", JSONArray.toJSONString((int[])null)); - assertEquals("[]", JSONArray.toJSONString(new int[0])); - assertEquals("[12]", JSONArray.toJSONString(new int[] { 12 })); - assertEquals("[-7,22,86,-99]", JSONArray.toJSONString(new int[] { -7, 22, 86, -99 })); - - StringWriter writer; - - writer = new StringWriter(); - JSONArray.writeJSONString((int[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new int[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new int[] { 12 }, writer); - assertEquals("[12]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new int[] { -7, 22, 86, -99 }, writer); - assertEquals("[-7,22,86,-99]", writer.toString()); - } - - public void testLongArrayToString() throws IOException { - assertEquals("null", JSONArray.toJSONString((long[])null)); - assertEquals("[]", JSONArray.toJSONString(new long[0])); - assertEquals("[12]", JSONArray.toJSONString(new long[] { 12 })); - assertEquals("[-7,22,9223372036854775807,-99]", JSONArray.toJSONString(new long[] { -7, 22, 9223372036854775807L, -99 })); - - StringWriter writer; - - writer = new StringWriter(); - JSONArray.writeJSONString((long[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new long[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new long[] { 12 }, writer); - assertEquals("[12]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new long[] { -7, 22, 86, -99 }, writer); - assertEquals("[-7,22,86,-99]", writer.toString()); - } - - public void testFloatArrayToString() throws IOException { - assertEquals("null", JSONArray.toJSONString((float[])null)); - assertEquals("[]", JSONArray.toJSONString(new float[0])); - assertEquals("[12.8]", JSONArray.toJSONString(new float[] { 12.8f })); - assertEquals("[-7.1,22.234,86.7,-99.02]", JSONArray.toJSONString(new float[] { -7.1f, 22.234f, 86.7f, -99.02f })); - - StringWriter writer; - - writer = new StringWriter(); - JSONArray.writeJSONString((float[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new float[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new float[] { 12.8f }, writer); - assertEquals("[12.8]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new float[] { -7.1f, 22.234f, 86.7f, -99.02f }, writer); - assertEquals("[-7.1,22.234,86.7,-99.02]", writer.toString()); - } - - public void testDoubleArrayToString() throws IOException { - assertEquals("null", JSONArray.toJSONString((double[])null)); - assertEquals("[]", JSONArray.toJSONString(new double[0])); - assertEquals("[12.8]", JSONArray.toJSONString(new double[] { 12.8 })); - assertEquals("[-7.1,22.234,86.7,-99.02]", JSONArray.toJSONString(new double[] { -7.1, 22.234, 86.7, -99.02 })); - - StringWriter writer; - - writer = new StringWriter(); - JSONArray.writeJSONString((double[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new double[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new double[] { 12.8 }, writer); - assertEquals("[12.8]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new double[] { -7.1, 22.234, 86.7, -99.02 }, writer); - assertEquals("[-7.1,22.234,86.7,-99.02]", writer.toString()); - } - - public void testBooleanArrayToString() throws IOException { - assertEquals("null", JSONArray.toJSONString((boolean[])null)); - assertEquals("[]", JSONArray.toJSONString(new boolean[0])); - assertEquals("[true]", JSONArray.toJSONString(new boolean[] { true })); - assertEquals("[true,false,true]", JSONArray.toJSONString(new boolean[] { true, false, true })); - - StringWriter writer; - - writer = new StringWriter(); - JSONArray.writeJSONString((boolean[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new boolean[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new boolean[] { true }, writer); - assertEquals("[true]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new boolean[] { true, false, true }, writer); - assertEquals("[true,false,true]", writer.toString()); - } - - public void testCharArrayToString() throws IOException { - assertEquals("null", JSONArray.toJSONString((char[])null)); - assertEquals("[]", JSONArray.toJSONString(new char[0])); - assertEquals("[\"a\"]", JSONArray.toJSONString(new char[] { 'a' })); - assertEquals("[\"a\",\"b\",\"c\"]", JSONArray.toJSONString(new char[] { 'a', 'b', 'c' })); - - StringWriter writer; - - writer = new StringWriter(); - JSONArray.writeJSONString((char[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new char[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new char[] { 'a' }, writer); - assertEquals("[\"a\"]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new char[] { 'a', 'b', 'c' }, writer); - assertEquals("[\"a\",\"b\",\"c\"]", writer.toString()); - } - - public void testObjectArrayToString() throws IOException { - assertEquals("null", JSONArray.toJSONString((Object[])null)); - assertEquals("[]", JSONArray.toJSONString(new Object[0])); - assertEquals("[\"Hello\"]", JSONArray.toJSONString(new Object[] { "Hello" })); - assertEquals("[\"Hello\",12,[1,2,3]]", JSONArray.toJSONString(new Object[] { "Hello", new Integer(12), new int[] { 1, 2, 3 } })); - - StringWriter writer; - - writer = new StringWriter(); - JSONArray.writeJSONString((Object[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new Object[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new Object[] { "Hello" }, writer); - assertEquals("[\"Hello\"]", writer.toString()); - - writer = new StringWriter(); - JSONArray.writeJSONString(new Object[] { "Hello", new Integer(12), new int[] { 1, 2, 3} }, writer); - assertEquals("[\"Hello\",12,[1,2,3]]", writer.toString()); - } -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/JSONValueTest.java b/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/JSONValueTest.java deleted file mode 100644 index d775d21c..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/JSONValueTest.java +++ /dev/null @@ -1,256 +0,0 @@ -package org.json.simple; - -import java.io.IOException; -import java.io.StringWriter; - -import junit.framework.TestCase; - -public class JSONValueTest extends TestCase { - public void testByteArrayToString() throws IOException { - assertEquals("null", JSONValue.toJSONString((byte[])null)); - assertEquals("[]", JSONValue.toJSONString(new byte[0])); - assertEquals("[12]", JSONValue.toJSONString(new byte[] { 12 })); - assertEquals("[-7,22,86,-99]", JSONValue.toJSONString(new byte[] { -7, 22, 86, -99 })); - - StringWriter writer; - - writer = new StringWriter(); - JSONValue.writeJSONString((byte[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new byte[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new byte[] { 12 }, writer); - assertEquals("[12]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new byte[] { -7, 22, 86, -99 }, writer); - assertEquals("[-7,22,86,-99]", writer.toString()); - } - - public void testShortArrayToString() throws IOException { - assertEquals("null", JSONValue.toJSONString((short[])null)); - assertEquals("[]", JSONValue.toJSONString(new short[0])); - assertEquals("[12]", JSONValue.toJSONString(new short[] { 12 })); - assertEquals("[-7,22,86,-99]", JSONValue.toJSONString(new short[] { -7, 22, 86, -99 })); - - StringWriter writer; - - writer = new StringWriter(); - JSONValue.writeJSONString((short[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new short[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new short[] { 12 }, writer); - assertEquals("[12]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new short[] { -7, 22, 86, -99 }, writer); - assertEquals("[-7,22,86,-99]", writer.toString()); - } - - public void testIntArrayToString() throws IOException { - assertEquals("null", JSONValue.toJSONString((int[])null)); - assertEquals("[]", JSONValue.toJSONString(new int[0])); - assertEquals("[12]", JSONValue.toJSONString(new int[] { 12 })); - assertEquals("[-7,22,86,-99]", JSONValue.toJSONString(new int[] { -7, 22, 86, -99 })); - - StringWriter writer; - - writer = new StringWriter(); - JSONValue.writeJSONString((int[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new int[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new int[] { 12 }, writer); - assertEquals("[12]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new int[] { -7, 22, 86, -99 }, writer); - assertEquals("[-7,22,86,-99]", writer.toString()); - } - - public void testLongArrayToString() throws IOException { - assertEquals("null", JSONValue.toJSONString((long[])null)); - assertEquals("[]", JSONValue.toJSONString(new long[0])); - assertEquals("[12]", JSONValue.toJSONString(new long[] { 12 })); - assertEquals("[-7,22,9223372036854775807,-99]", JSONValue.toJSONString(new long[] { -7, 22, 9223372036854775807L, -99 })); - - StringWriter writer; - - writer = new StringWriter(); - JSONValue.writeJSONString((long[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new long[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new long[] { 12 }, writer); - assertEquals("[12]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new long[] { -7, 22, 86, -99 }, writer); - assertEquals("[-7,22,86,-99]", writer.toString()); - } - - public void testFloatArrayToString() throws IOException { - assertEquals("null", JSONValue.toJSONString((float[])null)); - assertEquals("[]", JSONValue.toJSONString(new float[0])); - assertEquals("[12.8]", JSONValue.toJSONString(new float[] { 12.8f })); - assertEquals("[-7.1,22.234,86.7,-99.02]", JSONValue.toJSONString(new float[] { -7.1f, 22.234f, 86.7f, -99.02f })); - - StringWriter writer; - - writer = new StringWriter(); - JSONValue.writeJSONString((float[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new float[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new float[] { 12.8f }, writer); - assertEquals("[12.8]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new float[] { -7.1f, 22.234f, 86.7f, -99.02f }, writer); - assertEquals("[-7.1,22.234,86.7,-99.02]", writer.toString()); - } - - public void testDoubleArrayToString() throws IOException { - assertEquals("null", JSONValue.toJSONString((double[])null)); - assertEquals("[]", JSONValue.toJSONString(new double[0])); - assertEquals("[12.8]", JSONValue.toJSONString(new double[] { 12.8 })); - assertEquals("[-7.1,22.234,86.7,-99.02]", JSONValue.toJSONString(new double[] { -7.1, 22.234, 86.7, -99.02 })); - - StringWriter writer; - - writer = new StringWriter(); - JSONValue.writeJSONString((double[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new double[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new double[] { 12.8 }, writer); - assertEquals("[12.8]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new double[] { -7.1, 22.234, 86.7, -99.02 }, writer); - assertEquals("[-7.1,22.234,86.7,-99.02]", writer.toString()); - } - - public void testBooleanArrayToString() throws IOException { - assertEquals("null", JSONValue.toJSONString((boolean[])null)); - assertEquals("[]", JSONValue.toJSONString(new boolean[0])); - assertEquals("[true]", JSONValue.toJSONString(new boolean[] { true })); - assertEquals("[true,false,true]", JSONValue.toJSONString(new boolean[] { true, false, true })); - - StringWriter writer; - - writer = new StringWriter(); - JSONValue.writeJSONString((boolean[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new boolean[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new boolean[] { true }, writer); - assertEquals("[true]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new boolean[] { true, false, true }, writer); - assertEquals("[true,false,true]", writer.toString()); - } - - public void testCharArrayToString() throws IOException { - assertEquals("null", JSONValue.toJSONString((char[])null)); - assertEquals("[]", JSONValue.toJSONString(new char[0])); - assertEquals("[\"a\"]", JSONValue.toJSONString(new char[] { 'a' })); - assertEquals("[\"a\",\"b\",\"c\"]", JSONValue.toJSONString(new char[] { 'a', 'b', 'c' })); - - StringWriter writer; - - writer = new StringWriter(); - JSONValue.writeJSONString((char[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new char[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new char[] { 'a' }, writer); - assertEquals("[\"a\"]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new char[] { 'a', 'b', 'c' }, writer); - assertEquals("[\"a\",\"b\",\"c\"]", writer.toString()); - } - - public void testObjectArrayToString() throws IOException { - assertEquals("null", JSONValue.toJSONString((Object[])null)); - assertEquals("[]", JSONValue.toJSONString(new Object[0])); - assertEquals("[\"Hello\"]", JSONValue.toJSONString(new Object[] { "Hello" })); - assertEquals("[\"Hello\",12,[1,2,3]]", JSONValue.toJSONString(new Object[] { "Hello", new Integer(12), new int[] { 1, 2, 3 } })); - - StringWriter writer; - - writer = new StringWriter(); - JSONValue.writeJSONString((Object[])null, writer); - assertEquals("null", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new Object[0], writer); - assertEquals("[]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new Object[] { "Hello" }, writer); - assertEquals("[\"Hello\"]", writer.toString()); - - writer = new StringWriter(); - JSONValue.writeJSONString(new Object[] { "Hello", new Integer(12), new int[] { 1, 2, 3} }, writer); - assertEquals("[\"Hello\",12,[1,2,3]]", writer.toString()); - } - - public void testArraysOfArrays() throws IOException { - - StringWriter writer; - - final int[][][] nestedIntArray = new int[][][]{{{1}, {5}}, {{2}, {6}}}; - final String expectedNestedIntString = "[[[1],[5]],[[2],[6]]]"; - - assertEquals(expectedNestedIntString, JSONValue.toJSONString(nestedIntArray)); - - writer = new StringWriter(); - JSONValue.writeJSONString(nestedIntArray, writer); - assertEquals(expectedNestedIntString, writer.toString()); - - final String[][] nestedStringArray = new String[][]{{"a", "b"}, {"c", "d"}}; - final String expectedNestedStringString = "[[\"a\",\"b\"],[\"c\",\"d\"]]"; - - assertEquals(expectedNestedStringString, JSONValue.toJSONString(nestedStringArray)); - - writer = new StringWriter(); - JSONValue.writeJSONString(nestedStringArray, writer); - assertEquals(expectedNestedStringString, writer.toString()); - } -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/Test.java b/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/Test.java deleted file mode 100644 index 17745f29..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/Test.java +++ /dev/null @@ -1,391 +0,0 @@ -/* - * $Id: Test.java,v 1.1 2006/04/15 14:40:06 platform Exp $ - * Created on 2006-4-15 - */ -package org.json.simple; - -import java.io.IOException; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import junit.framework.TestCase; - -import org.json.simple.parser.ContainerFactory; -import org.json.simple.parser.ContentHandler; -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; - -/** - * @author FangYidong - */ -public class Test extends TestCase{ - - public void testDecode() throws Exception{ - System.out.println("=======decode======="); - - String s="[0,{\"1\":{\"2\":{\"3\":{\"4\":[5,{\"6\":7}]}}}}]"; - Object obj=JSONValue.parse(s); - JSONArray array=(JSONArray)obj; - System.out.println("======the 2nd element of array======"); - System.out.println(array.get(1)); - System.out.println(); - assertEquals("{\"1\":{\"2\":{\"3\":{\"4\":[5,{\"6\":7}]}}}}",array.get(1).toString()); - - JSONObject obj2=(JSONObject)array.get(1); - System.out.println("======field \"1\"=========="); - System.out.println(obj2.get("1")); - assertEquals("{\"2\":{\"3\":{\"4\":[5,{\"6\":7}]}}}",obj2.get("1").toString()); - - s="{}"; - obj=JSONValue.parse(s); - assertEquals("{}",obj.toString()); - - s="[5,]"; - obj=JSONValue.parse(s); - assertEquals("[5]",obj.toString()); - - s="[5,,2]"; - obj=JSONValue.parse(s); - assertEquals("[5,2]",obj.toString()); - - s="[\"hello\\bworld\\\"abc\\tdef\\\\ghi\\rjkl\\n123\\u4e2d\"]"; - obj=JSONValue.parse(s); - assertEquals("hello\bworld\"abc\tdef\\ghi\rjkl\n123中",((List)obj).get(0).toString()); - - JSONParser parser = new JSONParser(); - s="{\"name\":"; - try{ - obj = parser.parse(s); - } - catch(ParseException pe){ - assertEquals(ParseException.ERROR_UNEXPECTED_TOKEN, pe.getErrorType()); - assertEquals(8, pe.getPosition()); - } - - s="{\"name\":}"; - try{ - obj = parser.parse(s); - } - catch(ParseException pe){ - assertEquals(ParseException.ERROR_UNEXPECTED_TOKEN, pe.getErrorType()); - assertEquals(8, pe.getPosition()); - } - - - s="{\"name"; - try{ - obj = parser.parse(s); - } - catch(ParseException pe){ - assertEquals(ParseException.ERROR_UNEXPECTED_TOKEN, pe.getErrorType()); - assertEquals(6, pe.getPosition()); - } - - - s = "[[null, 123.45, \"a\\\tb c\"}, true]"; - try{ - parser.parse(s); - } - catch(ParseException pe){ - assertEquals(24, pe.getPosition()); - System.out.println("Error at character position: " + pe.getPosition()); - switch(pe.getErrorType()){ - case ParseException.ERROR_UNEXPECTED_TOKEN: - System.out.println("Unexpected token: " + pe.getUnexpectedObject()); - break; - case ParseException.ERROR_UNEXPECTED_CHAR: - System.out.println("Unexpected character: " + pe.getUnexpectedObject()); - break; - case ParseException.ERROR_UNEXPECTED_EXCEPTION: - ((Exception)pe.getUnexpectedObject()).printStackTrace(); - break; - } - } - - s = "{\"first\": 123, \"second\": [4, 5, 6], \"third\": 789}"; - ContainerFactory containerFactory = new ContainerFactory(){ - public List creatArrayContainer() { - return new LinkedList(); - } - - public Map createObjectContainer() { - return new LinkedHashMap(); - } - - }; - - try{ - Map json = (Map)parser.parse(s, containerFactory); - Iterator iter = json.entrySet().iterator(); - System.out.println("==iterate result=="); - while(iter.hasNext()){ - Map.Entry entry = (Map.Entry)iter.next(); - System.out.println(entry.getKey() + "=>" + entry.getValue()); - } - - System.out.println("==toJSONString()=="); - System.out.println(JSONValue.toJSONString(json)); - assertEquals("{\"first\":123,\"second\":[4,5,6],\"third\":789}", JSONValue.toJSONString(json)); - } - catch(ParseException pe){ - pe.printStackTrace(); - } - - s = "{\"first\": 123, \"second\": [{\"s1\":{\"s11\":\"v11\"}}, 4, 5, 6], \"third\": 789}"; - ContentHandler myHandler = new ContentHandler() { - - public boolean endArray() throws ParseException { - System.out.println("endArray()"); - return true; - } - - public void endJSON() throws ParseException { - System.out.println("endJSON()"); - } - - public boolean endObject() throws ParseException { - System.out.println("endObject()"); - return true; - } - - public boolean endObjectEntry() throws ParseException { - System.out.println("endObjectEntry()"); - return true; - } - - public boolean primitive(Object value) throws ParseException { - System.out.println("primitive(): " + value); - return true; - } - - public boolean startArray() throws ParseException { - System.out.println("startArray()"); - return true; - } - - public void startJSON() throws ParseException { - System.out.println("startJSON()"); - } - - public boolean startObject() throws ParseException { - System.out.println("startObject()"); - return true; - } - - public boolean startObjectEntry(String key) throws ParseException { - System.out.println("startObjectEntry(), key:" + key); - return true; - } - - }; - try{ - parser.parse(s, myHandler); - } - catch(ParseException pe){ - pe.printStackTrace(); - } - - class KeyFinder implements ContentHandler{ - private Object value; - private boolean found = false; - private boolean end = false; - private String key; - private String matchKey; - - public void setMatchKey(String matchKey){ - this.matchKey = matchKey; - } - - public Object getValue(){ - return value; - } - - public boolean isEnd(){ - return end; - } - - public void setFound(boolean found){ - this.found = found; - } - - public boolean isFound(){ - return found; - } - - public void startJSON() throws ParseException, IOException { - found = false; - end = false; - } - - public void endJSON() throws ParseException, IOException { - end = true; - } - - public boolean primitive(Object value) throws ParseException, IOException { - if(key != null){ - if(key.equals(matchKey)){ - found = true; - this.value = value; - key = null; - return false; - } - } - return true; - } - - public boolean startArray() throws ParseException, IOException { - return true; - } - - - public boolean startObject() throws ParseException, IOException { - return true; - } - - public boolean startObjectEntry(String key) throws ParseException, IOException { - this.key = key; - return true; - } - - public boolean endArray() throws ParseException, IOException { - return false; - } - - public boolean endObject() throws ParseException, IOException { - return true; - } - - public boolean endObjectEntry() throws ParseException, IOException { - return true; - } - }; - - s = "{\"first\": 123, \"second\": [{\"k1\":{\"id\":\"id1\"}}, 4, 5, 6, {\"id\": 123}], \"third\": 789, \"id\": null}"; - parser.reset(); - KeyFinder keyFinder = new KeyFinder(); - keyFinder.setMatchKey("id"); - int i = 0; - try{ - while(!keyFinder.isEnd()){ - parser.parse(s, keyFinder, true); - if(keyFinder.isFound()){ - i++; - keyFinder.setFound(false); - System.out.println("found id:"); - System.out.println(keyFinder.getValue()); - if(i == 1) - assertEquals("id1", keyFinder.getValue()); - if(i == 2){ - assertTrue(keyFinder.getValue() instanceof Number); - assertEquals("123", String.valueOf(keyFinder.getValue())); - } - if(i == 3) - assertTrue(null == keyFinder.getValue()); - } - } - } - catch(ParseException pe){ - pe.printStackTrace(); - } - } - - public void testEncode() throws Exception{ - System.out.println("=======encode======="); - - JSONArray array1=new JSONArray(); - array1.add("abc\u0010a/"); - array1.add(new Integer(123)); - array1.add(new Double(222.123)); - array1.add(new Boolean(true)); - System.out.println("======array1=========="); - System.out.println(array1); - System.out.println(); - assertEquals("[\"abc\\u0010a\\/\",123,222.123,true]",array1.toString()); - - JSONObject obj1=new JSONObject(); - obj1.put("name","fang"); - obj1.put("age",new Integer(27)); - obj1.put("is_developer",new Boolean(true)); - obj1.put("weight",new Double(60.21)); - obj1.put("array1",array1); - System.out.println("======obj1 with array1==========="); - System.out.println(obj1); - System.out.println(); - assertEquals("{\"array1\":[\"abc\\u0010a\\/\",123,222.123,true],\"weight\":60.21,\"age\":27,\"name\":\"fang\",\"is_developer\":true}",obj1.toString()); - - obj1.remove("array1"); - array1.add(obj1); - System.out.println("======array1 with obj1========"); - System.out.println(array1); - System.out.println(); - assertEquals("[\"abc\\u0010a\\/\",123,222.123,true,{\"weight\":60.21,\"age\":27,\"name\":\"fang\",\"is_developer\":true}]",array1.toString()); - - List list = new ArrayList(); - list.add("abc\u0010a/"); - list.add(new Integer(123)); - list.add(new Double(222.123)); - list.add(new Boolean(true)); - list.add(null); - System.out.println("======list=========="); - System.out.println(JSONArray.toJSONString(list)); - System.out.println(); - assertEquals("[\"abc\\u0010a\\/\",123,222.123,true,null]",JSONArray.toJSONString(list)); - - Map map = new HashMap(); - map.put("name","fang"); - map.put("age",new Integer(27)); - map.put("is_developer",new Boolean(true)); - map.put("weight",new Double(60.21)); - map.put("array1",list); - System.out.println("======map with list==========="); - System.out.println(map); - System.out.println(); - assertEquals("{\"array1\":[\"abc\\u0010a\\/\",123,222.123,true,null],\"weight\":60.21,\"age\":27,\"name\":\"fang\",\"is_developer\":true}",JSONObject.toJSONString(map)); - - Map m1 = new LinkedHashMap(); - Map m2 = new HashMap(); - List l1 = new LinkedList(); - - m1.put("k11","v11"); - m1.put("k12","v12"); - m1.put("k13", "v13"); - m2.put("k21","v21"); - m2.put("k22","v22"); - m2.put("k23","v23"); - l1.add(m1); - l1.add(m2); - String jsonString = JSONValue.toJSONString(l1); - System.out.println(jsonString); - assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\"},{\"k22\":\"v22\",\"k21\":\"v21\",\"k23\":\"v23\"}]", jsonString); - - StringWriter out = new StringWriter(); - JSONValue.writeJSONString(l1, out); - jsonString = out.toString(); - System.out.println(jsonString); - assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\"},{\"k22\":\"v22\",\"k21\":\"v21\",\"k23\":\"v23\"}]", jsonString); - - List l2 = new LinkedList(); - Map m3 = new LinkedHashMap(); - m3.put("k31", "v3"); - m3.put("k32", new Double(123.45)); - m3.put("k33", new Boolean(false)); - m3.put("k34", null); - l2.add("vvv"); - l2.add("1.23456789123456789"); - l2.add(new Boolean(true)); - l2.add(null); - m3.put("k35", l2); - m1.put("k14", m3); - out = new StringWriter(); - JSONValue.writeJSONString(l1, out); - jsonString = out.toString(); - System.out.println(jsonString); - assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\",\"k14\":{\"k31\":\"v3\",\"k32\":123.45,\"k33\":false,\"k34\":null,\"k35\":[\"vvv\",\"1.23456789123456789\",true,null]}},{\"k22\":\"v22\",\"k21\":\"v21\",\"k23\":\"v23\"}]",jsonString); - } -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/parser/YylexTest.java b/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/parser/YylexTest.java deleted file mode 100644 index f0023d9e..00000000 --- a/maxkey-protocols/maxkey-protocol-simulate/test/org/json/simple/parser/YylexTest.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.json.simple.parser; - -import java.io.IOException; -import java.io.StringReader; - -import junit.framework.TestCase; - -public class YylexTest extends TestCase { - - public void testYylex() throws Exception{ - String s="\"\\/\""; - System.out.println(s); - StringReader in = new StringReader(s); - Yylex lexer=new Yylex(in); - Yytoken token=lexer.yylex(); - assertEquals(Yytoken.TYPE_VALUE,token.type); - assertEquals("/",token.value); - - s="\"abc\\/\\r\\b\\n\\t\\f\\\\\""; - System.out.println(s); - in = new StringReader(s); - lexer=new Yylex(in); - token=lexer.yylex(); - assertEquals(Yytoken.TYPE_VALUE,token.type); - assertEquals("abc/\r\b\n\t\f\\",token.value); - - s="[\t \n\r\n{ \t \t\n\r}"; - System.out.println(s); - in = new StringReader(s); - lexer=new Yylex(in); - token=lexer.yylex(); - assertEquals(Yytoken.TYPE_LEFT_SQUARE,token.type); - token=lexer.yylex(); - assertEquals(Yytoken.TYPE_LEFT_BRACE,token.type); - token=lexer.yylex(); - assertEquals(Yytoken.TYPE_RIGHT_BRACE,token.type); - - s="\b\f{"; - System.out.println(s); - in = new StringReader(s); - lexer=new Yylex(in); - ParseException err=null; - try{ - token=lexer.yylex(); - } - catch(ParseException e){ - err=e; - System.out.println("error:"+err); - assertEquals(ParseException.ERROR_UNEXPECTED_CHAR, e.getErrorType()); - assertEquals(0,e.getPosition()); - assertEquals(new Character('\b'),e.getUnexpectedObject()); - } - catch(IOException ie){ - throw ie; - } - assertTrue(err!=null); - - s="{a : b}"; - System.out.println(s); - in = new StringReader(s); - lexer=new Yylex(in); - err=null; - try{ - lexer.yylex(); - token=lexer.yylex(); - } - catch(ParseException e){ - err=e; - System.out.println("error:"+err); - assertEquals(ParseException.ERROR_UNEXPECTED_CHAR, e.getErrorType()); - assertEquals(new Character('a'),e.getUnexpectedObject()); - assertEquals(1,e.getPosition()); - } - catch(IOException ie){ - throw ie; - } - assertTrue(err!=null); - } - -} \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-maxkey/bin/main/messages/message.properties b/maxkey-webs/maxkey-web-maxkey/bin/main/messages/message.properties index 55f2979e..39e2fd7a 100644 --- a/maxkey-webs/maxkey-web-maxkey/bin/main/messages/message.properties +++ b/maxkey-webs/maxkey-web-maxkey/bin/main/messages/message.properties @@ -10,9 +10,9 @@ global.text.logout=\u9000\u51FA global.logout.tip=\u6CE8\u9500\u6210\u529F global.logout.text.suffix=\u91CD\u65B0\u767B\u5F55 global.logout.text.prefix=\u60A8\u5DF2\u7ECF\u6210\u529F\u9000\u51FA\u767B\u5F55\uFF0C\u8BF7\u5173\u95ED\u6D4F\u89C8\u5668\u6216\u8005 -global.session.timeout.tip=\u767B\u5F55\u4F1A\u8BDD\u8D85\u65F6 -global.session.timeout.prefix=\u60A8\u7684\u767B\u5F55\u4F1A\u8BDD\u5DF2\u7ECF\u8D85\u65F6\uFF0C\u8BF7 -global.session.timeout.suffix=\u91CD\u65B0\u767B\u5F55 +login.session.timeout.tip=\u767B\u5F55\u4F1A\u8BDD\u8D85\u65F6 +login.session.timeout.prefix=\u60A8\u7684\u767B\u5F55\u4F1A\u8BDD\u5DF2\u7ECF\u8D85\u65F6\uFF0C\u8BF7 +login.session.timeout.suffix=\u91CD\u65B0\u767B\u5F55 common.window.title=\u7A97\u53E3 common.alert.title=\u63D0\u793A\u4FE1\u606F @@ -45,6 +45,15 @@ login.text.currenttime=\u65F6    \u95F4 login.text.otherlogins=\u5176\u4ED6\u767B\u5F55\u65B9\u5F0F login.text.register=\u7528\u6237\u6CE8\u518C +login.password.expired=\u5BC6\u7801\u8FC7\u671F +login.password.expired.tip=\u5BC6\u7801\u8FC7\u671F\uFF0C\u8BF7\u4FEE\u6539\u5BC6\u7801 +login.password.newPassword=\u65B0\u5BC6\u7801 +login.password.confirmPassword=\u786E\u8BA4\u65B0\u5BC6\u7801 + +login.password.initial.change.tip=\u9996\u6B21\u767B\u5F55\uFF0C\u8BF7\u4FEE\u6539\u521D\u59CB\u5316\u5BC6\u7801 + +userinfo.displayName=\u7528\u6237 +userinfo.username=\u767B\u5F55\u540D apps.icon=\u56FE\u6807 @@ -53,4 +62,5 @@ apps.protocol=\u8BBF\u95EE\u534F\u8BAE apps.category=\u7C7B\u578B button.text.action=\u8BBF\u95EE button.text.visit=\u8BBF\u95EE +button.text.save=\u4FDD\u5B58 diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties index 55f2979e..39e2fd7a 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties @@ -10,9 +10,9 @@ global.text.logout=\u9000\u51FA global.logout.tip=\u6CE8\u9500\u6210\u529F global.logout.text.suffix=\u91CD\u65B0\u767B\u5F55 global.logout.text.prefix=\u60A8\u5DF2\u7ECF\u6210\u529F\u9000\u51FA\u767B\u5F55\uFF0C\u8BF7\u5173\u95ED\u6D4F\u89C8\u5668\u6216\u8005 -global.session.timeout.tip=\u767B\u5F55\u4F1A\u8BDD\u8D85\u65F6 -global.session.timeout.prefix=\u60A8\u7684\u767B\u5F55\u4F1A\u8BDD\u5DF2\u7ECF\u8D85\u65F6\uFF0C\u8BF7 -global.session.timeout.suffix=\u91CD\u65B0\u767B\u5F55 +login.session.timeout.tip=\u767B\u5F55\u4F1A\u8BDD\u8D85\u65F6 +login.session.timeout.prefix=\u60A8\u7684\u767B\u5F55\u4F1A\u8BDD\u5DF2\u7ECF\u8D85\u65F6\uFF0C\u8BF7 +login.session.timeout.suffix=\u91CD\u65B0\u767B\u5F55 common.window.title=\u7A97\u53E3 common.alert.title=\u63D0\u793A\u4FE1\u606F @@ -45,6 +45,15 @@ login.text.currenttime=\u65F6    \u95F4 login.text.otherlogins=\u5176\u4ED6\u767B\u5F55\u65B9\u5F0F login.text.register=\u7528\u6237\u6CE8\u518C +login.password.expired=\u5BC6\u7801\u8FC7\u671F +login.password.expired.tip=\u5BC6\u7801\u8FC7\u671F\uFF0C\u8BF7\u4FEE\u6539\u5BC6\u7801 +login.password.newPassword=\u65B0\u5BC6\u7801 +login.password.confirmPassword=\u786E\u8BA4\u65B0\u5BC6\u7801 + +login.password.initial.change.tip=\u9996\u6B21\u767B\u5F55\uFF0C\u8BF7\u4FEE\u6539\u521D\u59CB\u5316\u5BC6\u7801 + +userinfo.displayName=\u7528\u6237 +userinfo.username=\u767B\u5F55\u540D apps.icon=\u56FE\u6807 @@ -53,4 +62,5 @@ apps.protocol=\u8BBF\u95EE\u534F\u8BAE apps.category=\u7C7B\u578B button.text.action=\u8BBF\u95EE button.text.visit=\u8BBF\u95EE +button.text.save=\u4FDD\u5B58 diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordExpired.jsp b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordExpired.jsp index 36be5e76..7fe4491f 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordExpired.jsp +++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordExpired.jsp @@ -3,11 +3,18 @@ <%@taglib prefix="s" uri="http://www.connsec.com/tags" %> - - - <s:Locale code="login.password.expired" /> + + + + + + <s:Locale code="login.password.expired" /> +

+ +
+
@@ -35,7 +42,7 @@ - + - +
:: * @@ -43,7 +50,7 @@
:: * @@ -65,5 +72,9 @@
+
+ diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordInitial.jsp b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordInitial.jsp index 449570e3..fee43e22 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordInitial.jsp +++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordInitial.jsp @@ -1,3 +1,20 @@ +<%@page session="false" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="s" uri="http://www.connsec.com/tags" %> + + + + + + + + <s:Locale code="login.password.initial.change.tip" /> + + +
+ +
+
@@ -8,7 +25,7 @@
- + @@ -25,7 +42,7 @@ - + - +
:
:: * @@ -33,7 +50,7 @@
:: * @@ -54,4 +71,9 @@
- +
+ + + diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/timeout.jsp b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/timeout.jsp index 50cb14f2..954c17f1 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/timeout.jsp +++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/timeout.jsp @@ -4,20 +4,28 @@ - - <s:Locale code="global.session.timeout.tip"/> + + + + + <s:Locale code="login.session.timeout.tip"/> - +
+ +
-

+

- + - + .

+ diff --git a/settings.gradle b/settings.gradle index a63408f9..074477c6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,7 +14,6 @@ include 'maxkey-jose-jwt' include 'maxkey-protocols:maxkey-protocol-oauth-2.0' include 'maxkey-protocols:maxkey-protocol-saml-2.0' -include 'maxkey-protocols:maxkey-protocol-simulate' include 'maxkey-protocols:maxkey-protocol-authorize' include 'maxkey-protocols:maxkey-protocol-desktop' include 'maxkey-protocols:maxkey-protocol-extendapi'