shimingxy před 5 roky
rodič
revize
e677d567b7
100 změnil soubory, kde provedl 390 přidání a 1272 odebrání
  1. 2 1
      .gitignore
  2. 4 0
      .settings/org.eclipse.jdt.core.prefs
  3. 173 5
      build.gradle
  4. 3 1
      gradle.properties
  5. 16 0
      maxkey-authentications/.settings/org.eclipse.jdt.core.prefs
  6. 113 0
      maxkey-client-sdk/.settings/org.eclipse.jdt.core.prefs
  7. 2 0
      maxkey-client-sdk/.settings/org.eclipse.jdt.launching.prefs
  8. 16 0
      maxkey-core/.settings/org.eclipse.jdt.core.prefs
  9. 2 0
      maxkey-core/.settings/org.eclipse.jdt.launching.prefs
  10. 2 1
      maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java
  11. 0 33
      maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/BaseClientDetails.java
  12. 0 41
      maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/JacksonArrayOrStringDeserializer.java
  13. 5 4
      maxkey-core/src/main/java/org/maxkey/json/JsonDateSerializer.java
  14. 5 4
      maxkey-core/src/main/java/org/maxkey/json/JsonDateTimeDeserializer.java
  15. 5 4
      maxkey-core/src/main/java/org/maxkey/json/JsonDateTimeSerializer.java
  16. 6 5
      maxkey-core/src/main/java/org/maxkey/json/JsonISODateDeserializer.java
  17. 5 4
      maxkey-core/src/main/java/org/maxkey/json/JsonISODateSerializer.java
  18. 3 3
      maxkey-core/src/main/java/org/maxkey/pretty/impl/JsonPretty.java
  19. 4 7
      maxkey-core/src/main/java/org/maxkey/util/JsonUtils.java
  20. 4 0
      maxkey-dao/.settings/org.eclipse.jdt.core.prefs
  21. 20 0
      maxkey-dao/.settings/org.eclipse.wst.validation.prefs
  22. 0 6
      maxkey-demos/.classpath
  23. 0 23
      maxkey-demos/.project
  24. 0 11
      maxkey-demos/.settings/org.eclipse.buildship.core.prefs
  25. 0 2
      maxkey-demos/.settings/org.eclipse.core.resources.prefs
  26. 0 17
      maxkey-demos/maxkey-demo-cas/.classpath
  27. 0 36
      maxkey-demos/maxkey-demo-cas/.project
  28. 0 11
      maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.buildship.core.prefs
  29. 0 2
      maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.core.resources.prefs
  30. 0 8
      maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.wst.common.component
  31. 0 7
      maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.wst.common.project.facet.core.xml
  32. 0 21
      maxkey-demos/maxkey-demo-cas/build.gradle
  33. binární
      maxkey-demos/maxkey-demo-cas/lib/cas-client-core-3.2.1.jar
  34. binární
      maxkey-demos/maxkey-demo-cas/lib/commons-codec-1.4.jar
  35. binární
      maxkey-demos/maxkey-demo-cas/lib/commons-logging-1.1.1.jar
  36. binární
      maxkey-demos/maxkey-demo-cas/lib/slf4j-api-1.5.11.jar
  37. 0 3
      maxkey-demos/maxkey-demo-cas/src/main/webapp/META-INF/MANIFEST.MF
  38. 0 78
      maxkey-demos/maxkey-demo-cas/src/main/webapp/WEB-INF/web.xml
  39. binární
      maxkey-demos/maxkey-demo-cas/src/main/webapp/images/cas.png
  40. binární
      maxkey-demos/maxkey-demo-cas/src/main/webapp/images/favicon.ico
  41. 0 115
      maxkey-demos/maxkey-demo-cas/src/main/webapp/index.jsp
  42. 0 72
      maxkey-demos/maxkey-demo-cas/src/main/webapp/test.html
  43. 0 23
      maxkey-demos/maxkey-demo-jwt/.classpath
  44. 0 7
      maxkey-demos/maxkey-demo-jwt/.externalToolBuilders/org.eclipse.wst.common.project.facet.core.builder (1).launch
  45. 0 36
      maxkey-demos/maxkey-demo-jwt/.project
  46. 0 11
      maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.buildship.core.prefs
  47. 0 2
      maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.core.resources.prefs
  48. 0 9
      maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.wst.common.component
  49. 0 7
      maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.wst.common.project.facet.core.xml
  50. 0 12
      maxkey-demos/maxkey-demo-jwt/bin/main/jwk.jwks
  51. 0 20
      maxkey-demos/maxkey-demo-jwt/build.gradle
  52. binární
      maxkey-demos/maxkey-demo-jwt/lib/commons-codec-1.9.jar
  53. binární
      maxkey-demos/maxkey-demo-jwt/lib/commons-io-2.2.jar
  54. binární
      maxkey-demos/maxkey-demo-jwt/lib/commons-logging-1.1.1.jar
  55. binární
      maxkey-demos/maxkey-demo-jwt/lib/gson-2.2.4.jar
  56. binární
      maxkey-demos/maxkey-demo-jwt/lib/json-smart-1.2.jar
  57. binární
      maxkey-demos/maxkey-demo-jwt/lib/log4j-1.2.17.jar
  58. binární
      maxkey-demos/maxkey-demo-jwt/lib/maxkey-client-sdk.jar
  59. binární
      maxkey-demos/maxkey-demo-jwt/lib/maxkey-jose-jwt.jar
  60. 0 2
      maxkey-demos/maxkey-demo-jwt/src/META-INF/MANIFEST.MF
  61. 0 12
      maxkey-demos/maxkey-demo-jwt/src/main/resources/jwk.jwks
  62. 0 3
      maxkey-demos/maxkey-demo-jwt/src/main/webapp/META-INF/MANIFEST.MF
  63. 0 35
      maxkey-demos/maxkey-demo-jwt/src/main/webapp/WEB-INF/web.xml
  64. binární
      maxkey-demos/maxkey-demo-jwt/src/main/webapp/images/favicon.ico
  65. binární
      maxkey-demos/maxkey-demo-jwt/src/main/webapp/images/jwt.png
  66. 0 30
      maxkey-demos/maxkey-demo-jwt/src/main/webapp/index.jsp
  67. 0 153
      maxkey-demos/maxkey-demo-jwt/src/main/webapp/jwtcallback.jsp
  68. 0 17
      maxkey-demos/maxkey-demo-ltpa/.classpath
  69. 0 36
      maxkey-demos/maxkey-demo-ltpa/.project
  70. 0 11
      maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.buildship.core.prefs
  71. 0 2
      maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.core.resources.prefs
  72. 0 8
      maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.wst.common.component
  73. 0 7
      maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.wst.common.project.facet.core.xml
  74. 0 20
      maxkey-demos/maxkey-demo-ltpa/build.gradle
  75. binární
      maxkey-demos/maxkey-demo-ltpa/lib/commons-codec-1.9.jar
  76. binární
      maxkey-demos/maxkey-demo-ltpa/lib/commons-logging-1.1.1.jar
  77. binární
      maxkey-demos/maxkey-demo-ltpa/lib/gson-2.2.4.jar
  78. binární
      maxkey-demos/maxkey-demo-ltpa/lib/log4j-1.2.17.jar
  79. binární
      maxkey-demos/maxkey-demo-ltpa/lib/maxkey-client-sdk.jar
  80. 0 2
      maxkey-demos/maxkey-demo-ltpa/src/META-INF/MANIFEST.MF
  81. 0 3
      maxkey-demos/maxkey-demo-ltpa/src/main/webapp/META-INF/MANIFEST.MF
  82. 0 2
      maxkey-demos/maxkey-demo-ltpa/src/main/webapp/WEB-INF/classes/META-INF/MANIFEST.MF
  83. 0 11
      maxkey-demos/maxkey-demo-ltpa/src/main/webapp/WEB-INF/web.xml
  84. binární
      maxkey-demos/maxkey-demo-ltpa/src/main/webapp/images/favicon.ico
  85. binární
      maxkey-demos/maxkey-demo-ltpa/src/main/webapp/images/ltpa.png
  86. 0 26
      maxkey-demos/maxkey-demo-ltpa/src/main/webapp/index.jsp
  87. 0 120
      maxkey-demos/maxkey-demo-ltpa/src/main/webapp/ltpa.jsp
  88. 0 23
      maxkey-demos/maxkey-demo-oauth/.classpath
  89. 0 36
      maxkey-demos/maxkey-demo-oauth/.project
  90. 0 11
      maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.buildship.core.prefs
  91. 0 2
      maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.core.resources.prefs
  92. 0 9
      maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.wst.common.component
  93. 0 7
      maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.wst.common.project.facet.core.xml
  94. 0 12
      maxkey-demos/maxkey-demo-oauth/bin/main/jwk.jwks
  95. 0 20
      maxkey-demos/maxkey-demo-oauth/build.gradle
  96. binární
      maxkey-demos/maxkey-demo-oauth/lib/commons-codec-1.9.jar
  97. binární
      maxkey-demos/maxkey-demo-oauth/lib/commons-io-2.2.jar
  98. binární
      maxkey-demos/maxkey-demo-oauth/lib/commons-logging-1.1.1.jar
  99. binární
      maxkey-demos/maxkey-demo-oauth/lib/connsec-oidc.jar
  100. binární
      maxkey-demos/maxkey-demo-oauth/lib/gson-2.2.4.jar

+ 2 - 1
.gitignore

@@ -16,4 +16,5 @@ build/*
 jdk/*
 
 */org/apache/mybatis/jpa/*
-org/apache/mybatis/jpa/*
+org/apache/mybatis/jpa/*
+/.gradle/

+ 4 - 0
.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.source=1.8

+ 173 - 5
build.gradle

@@ -7,12 +7,22 @@ defaultTasks "clean", "build"
 
 ext {
 	jackson2Version      = "2.9.8"
-	log4jVersion         = "2.11.2"
-	springVersion        = "5.1.6.RELEASE"
+	log4jVersion         = "2.12.0"
+	springVersion        = "5.1.8.RELEASE"
+	springBootVersion    = "2.1.6.RELEASE"
 	springSecurityVersion= "5.1.5.RELEASE"
 	hibernateVersion	 = "5.4.2.Final"
+	slf4jVersion	 	 = "1.7.26"
+	jacksonVersion		 = "2.9.9"
 }
 
+configurations.all {
+	transitive = false// 为本依赖关闭依赖传递特性
+	// 所有需要忽略的包定义在此
+	//all*.exclude group: 'commons-logging'
+	//exclude group: 'org.slf4j', module: 'slf4j-api'
+	//compile.exclude module: 'commons'
+}
 // Apply the java plugin to add support for Java
 //apply plugin: 'java'
 allprojects {
@@ -48,6 +58,14 @@ allprojects {
     
 }
 
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+       // classpath("org.springframework.boot:spring-boot-gradle-plugin:2.1.6.RELEASE")
+    }
+}
 
 // In this section you declare where to find the dependencies of your project
 repositories {
@@ -59,7 +77,9 @@ repositories {
 }
 
 subprojects {  
-
+	//apply plugin: 'org.springframework.boot'
+	//apply plugin: 'io.spring.dependency-management'
+	
 	sourceSets {
 	    main {
 	        java {
@@ -88,6 +108,156 @@ subprojects {
     	 compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
          compileOnly group: 'javax.servlet', name: 'jstl', version: '1.2'
          compileOnly group: 'javax.servlet', name: 'jsp-api', version: '2.0' 
+         
+         compile group: 'org.jboss.logging', name: 'jboss-logging', version: '3.4.0.Final'
+         
+         compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3'
+         compile group: 'commons-codec', name: 'commons-codec', version: '1.12'
+         compile group: 'commons-collections', name: 'commons-collections', version: '3.2.2'
+         compile group: 'org.apache.commons', name: 'commons-csv', version: '1.7'
+         compile group: 'org.apache.commons', name: 'commons-dbcp2', version: '2.6.0'
+         //compile group: 'commons-dbcp', name: 'commons-dbcp', version: '1.4'
+         compile group: 'commons-dbutils', name: 'commons-dbutils', version: '1.7'
+         compile group: 'org.apache.commons', name: 'commons-digester3', version: '3.2'
+         compile group: 'commons-digester', name: 'commons-digester', version: '2.1'
+         compile group: 'commons-io', name: 'commons-io', version: '2.6'
+         compile group: 'commons-lang', name: 'commons-lang', version: '2.6'
+         compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
+         compile group: 'commons-logging', name: 'commons-logging', version: '1.2'
+         compile group: 'org.apache.commons', name: 'commons-pool2', version: '2.6.2'
+         compile group: 'commons-httpclient', name: 'commons-httpclient', version: '3.1'
+         compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4'
+         compile group: 'org.apache.commons', name: 'commons-email', version: '1.5'
+         compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
+         compile group: 'org.apache.httpcomponents', name: 'fluent-hc', version: '4.5.6'
+         compile group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: '4.5.6'
+         compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.6'
+         compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.10'
+         compile group: 'org.apache.velocity', name: 'velocity', version: '1.7'
+         compile group: 'velocity', name: 'velocity-dep', version: '1.4'
+         testCompile group: 'org.apache.commons', name: 'not-yet-commons-ssl', version: '0.3.9'
+         
+         compile group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: "${log4jVersion}"
+         compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}"
+		 compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}"
+		 compile group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: "${log4jVersion}"
+		 compile group: 'org.apache.logging.log4j', name: 'log4j-jul', version: "${log4jVersion}"
+		 compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}"
+		 compile group: 'org.apache.logging.log4j', name: 'log4j-web', version: "${log4jVersion}"
+         compile group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}"
+         
+         compile group: 'org.springframework', name: 'spring-webmvc', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-core', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-aop', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-aspects', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-context', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-context-index', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-core', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-expression', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-instrument', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-jcl', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-jdbc', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-jms', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-messaging', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-orm', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-oxm', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-test', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-tx', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-web', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-webflux', version: "${springVersion}"
+         compile group: 'org.springframework', name: 'spring-websocket', version: "${springVersion}"
+         
+         compile group: 'org.springframework.security', name: 'spring-security-core', version: "${springSecurityVersion}"
+         compile group: 'org.springframework.security', name: 'spring-security-web', version: "${springSecurityVersion}"
+         compile group: 'org.springframework.security', name: 'spring-security-crypto', version: "${springSecurityVersion}"
+         
+         compile group: 'org.opensaml', name: 'opensaml', version: '2.6.4'
+         compile group: 'org.opensaml', name: 'openws', version: '1.5.4'
+         compile group: 'org.opensaml', name: 'xmltooling', version: '1.4.4'
+         
+         compile group: 'org.javassist', name: 'javassist', version: '3.23.0-GA'
+         compile group: 'javax.activation', name: 'activation', version: '1.1.1'
+         compile group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2'
+         compile group: 'javax.transaction', name: 'jta', version: '1.1'
+         compile group: 'taglibs', name: 'standard', version: '1.1.2'
+         compile group: 'javax.servlet.jsp.jstl', name: 'jstl', version: '1.2'
+         compile group: 'javax.transaction', name: 'javax.transaction-api', version: '1.3'
+         compile group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final'
+         compile group: 'org.owasp.esapi', name: 'esapi', version: '2.2.0.0'
+         
+         compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.60'
+         compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60'
+         compile group: 'org.bouncycastle', name: 'bcprov-ext-jdk15on', version: '1.60'
+         compile group: 'com.google.crypto.tink', name: 'tink', version: '1.2.2'
+         
+         compile group: 'com.github.penggle', name: 'kaptcha', version: '2.3.2'
+         
+         compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+         compile group: 'org.codehaus.jackson', name: 'jackson-all', version: '1.8.5'
+         compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonVersion}"
+         compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonVersion}"
+         compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "${jacksonVersion}"
+         compile group: 'com.fasterxml', name: 'classmate', version: '1.5.0'
+         
+         compile group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.2'
+         compile group: 'io.projectreactor', name: 'reactor-core', version: '3.2.10.RELEASE'
+         compile group: 'eu.tekul', name: 'szxcvbn_2.9.2', version: '0.2'
+         
+         compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.2.3'
+         
+         compile group: 'redis.clients', name: 'jedis', version: '3.0.1'
+         compile group: 'org.ehcache', name: 'ehcache', version: '3.5.3'
+         compile group: 'org.mybatis', name: 'mybatis', version: '3.5.1'
+         compile group: 'org.mybatis', name: 'mybatis-spring', version: '2.0.1'
+         compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.47'
+         compile group: 'com.mchange', name: 'c3p0', version: '0.9.5.4'
+         compile group: 'com.mchange', name: 'mchange-commons-java', version: '0.2.16'
+         compile group: 'org.hibernate.validator', name: 'hibernate-validator', version: '6.0.17.Final'
+         compile group: 'org.hibernate', name: 'hibernate-validator-cdi', version: '6.0.17.Final'
+         compile group: 'org.hibernate.validator', name: 'hibernate-validator-annotation-processor', version: '6.0.17.Final'
+        
+         
+         compile group: 'net.jradius', name: 'jradius-core', version: '1.1.5'
+         compile group: 'net.jradius', name: 'jradius-dictionary', version: '1.1.5'
+         
+         compile group: 'joda-time', name: 'joda-time', version: '2.10'
+         compile group: 'org.yaml', name: 'snakeyaml', version: '1.24'
+         compile group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: '1.9.22'
+         compile group: 'org.jdom', name: 'jdom', version: '2.0.2'
+         compile group: 'com.google.zxing', name: 'core', version: '3.4.0'
+         compile group: 'com.google.guava', name: 'guava', version: '27.1-jre'
+         compile group: 'ognl', name: 'ognl', version: '3.2.9'
+         compile group: 'cglib', name: 'cglib', version: '3.2.12'
+         compile group: 'org.ow2.asm', name: 'asm', version: '7.0'
+         compile group: 'aopalliance', name: 'aopalliance', version: '1.0'
+         compile group: 'org.aspectj', name: 'aspectjtools', version: '1.9.4'
+         compile group: 'dom4j', name: 'dom4j', version: '1.6.1'
+         compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+         compile group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.1'
+		 compile group: 'javax.xml', name: 'jsr173', version: '1.0'
+		 compile group: 'xalan', name: 'serializer', version: '2.7.2'
+		 compile group: 'xalan', name: 'xalan', version: '2.7.2'
+		 compile group: 'xerces', name: 'xercesImpl', version: '2.12.0'
+		 compile group: 'xml-apis', name: 'xml-apis', version: '1.0.b2'
+		 compile group: 'xml-resolver', name: 'xml-resolver', version: '1.2'
+		 compile group: 'org.apache.santuario', name: 'xmlsec', version: '1.5.8'
+		 compile group: 'org.ogce', name: 'xpp3', version: '1.1.6'
+		 compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.10'
+		 testCompile group: 'xmlunit', name: 'xmlunit', version: '1.6'
+		 
+         
+         
+         compile group: 'com.belerweb', name: 'pinyin4j', version: '2.5.1'
+         
+         
+         compile group: 'org.springframework.boot', name: 'spring-boot', version: "${springBootVersion}"
+         compile group: 'org.springframework.boot', name: 'spring-boot-starter', version:  "${springBootVersion}"
+         compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:  "${springBootVersion}"
+         testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:  "${springBootVersion}"
+         testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
+         
+         //compile("org.springframework.boot:spring-boot-starter-web")
+    	 //testCompile('org.springframework.boot:spring-boot-starter-test')
     }
     
       
@@ -143,8 +313,6 @@ subprojects {
 	task copyotherWar2Release(type: Copy) {
 		into "$rootDir/build/"
 	    from "$buildDir/libs/"
-	    include '*i18n*.war'
-	    include '*browserlauncher*.war'
 	}
 
 	//task buildRelease(dependsOn:['build','war','copyjar2Release','copyWar2Release','copyotherWar2Release','copydemoWar2Release']) << {

+ 3 - 1
gradle.properties

@@ -1,3 +1,5 @@
 group=org.maxkey
 version=1.0.0.RELEASE
-vendor=http://www.connsec.com
+vendor=https://github.com/shimingxy/MaxKey
+
+

+ 16 - 0
maxkey-authentications/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,16 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=warning
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error

+ 113 - 0
maxkey-client-sdk/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,113 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=warning
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error

+ 2 - 0
maxkey-client-sdk/.settings/org.eclipse.jdt.launching.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning

+ 16 - 0
maxkey-core/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,16 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=warning
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error

+ 2 - 0
maxkey-core/.settings/org.eclipse.jdt.launching.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning

+ 2 - 1
maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java

@@ -10,10 +10,11 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
-import org.codehaus.jackson.annotate.JsonIgnore;
 import org.maxkey.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * @author Crystal.Sea
  * 

+ 0 - 33
maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/BaseClientDetails.java

@@ -24,59 +24,43 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  */
 @SuppressWarnings("serial")
-@org.codehaus.jackson.map.annotate.JsonSerialize(include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_DEFAULT)
-@org.codehaus.jackson.annotate.JsonIgnoreProperties(ignoreUnknown = true)
 @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_DEFAULT)
 @com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true)
 public class BaseClientDetails implements ClientDetails {
 
-	@org.codehaus.jackson.annotate.JsonProperty("client_id")
 	@com.fasterxml.jackson.annotation.JsonProperty("client_id")
 	private String clientId;
 
-	@org.codehaus.jackson.annotate.JsonProperty("client_secret")
 	@com.fasterxml.jackson.annotation.JsonProperty("client_secret")
 	private String clientSecret;
 
-	@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
 	@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
 	private Set<String> scope = Collections.emptySet();
 
-	@org.codehaus.jackson.annotate.JsonProperty("resource_ids")
-	@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
 	@com.fasterxml.jackson.annotation.JsonProperty("resource_ids")
 	@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
 	private Set<String> resourceIds = Collections.emptySet();
 
-	@org.codehaus.jackson.annotate.JsonProperty("authorized_grant_types")
-	@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
 	@com.fasterxml.jackson.annotation.JsonProperty("authorized_grant_types")
 	@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
 	private Set<String> authorizedGrantTypes = Collections.emptySet();
 
-	@org.codehaus.jackson.annotate.JsonProperty("redirect_uri")
-	@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
 	@com.fasterxml.jackson.annotation.JsonProperty("redirect_uri")
 	@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
 	private Set<String> registeredRedirectUris;
 
-	@org.codehaus.jackson.annotate.JsonProperty("autoapprove")
-	@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
 	@com.fasterxml.jackson.annotation.JsonProperty("autoapprove")
 	@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
 	private Set<String> autoApproveScopes;
 
 	private List<GrantedAuthority> authorities = Collections.emptyList();
 
-	@org.codehaus.jackson.annotate.JsonProperty("access_token_validity")
 	@com.fasterxml.jackson.annotation.JsonProperty("access_token_validity")
 	private Integer accessTokenValiditySeconds;
 
-	@org.codehaus.jackson.annotate.JsonProperty("refresh_token_validity")
 	@com.fasterxml.jackson.annotation.JsonProperty("refresh_token_validity")
 	private Integer refreshTokenValiditySeconds;
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	private Map<String, Object> additionalInformation = new LinkedHashMap<String, Object>();
 
@@ -154,7 +138,6 @@ public class BaseClientDetails implements ClientDetails {
 		}
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public String getClientId() {
 		return clientId;
@@ -181,19 +164,16 @@ public class BaseClientDetails implements ClientDetails {
 		return false;
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public Set<String> getAutoApproveScopes() {
 		return autoApproveScopes;
 	}
 	
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public boolean isSecretRequired() {
 		return this.clientSecret != null;
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public String getClientSecret() {
 		return clientSecret;
@@ -203,7 +183,6 @@ public class BaseClientDetails implements ClientDetails {
 		this.clientSecret = clientSecret;
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public boolean isScoped() {
 		return this.scope != null && !this.scope.isEmpty();
@@ -218,7 +197,6 @@ public class BaseClientDetails implements ClientDetails {
 				: new LinkedHashSet<String>(scope);
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public Set<String> getResourceIds() {
 		return resourceIds;
@@ -229,7 +207,6 @@ public class BaseClientDetails implements ClientDetails {
 				.<String> emptySet() : new LinkedHashSet<String>(resourceIds);
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public Set<String> getAuthorizedGrantTypes() {
 		return authorizedGrantTypes;
@@ -240,7 +217,6 @@ public class BaseClientDetails implements ClientDetails {
 				authorizedGrantTypes);
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public Set<String> getRegisteredRedirectUri() {
 		return registeredRedirectUris;
@@ -251,15 +227,12 @@ public class BaseClientDetails implements ClientDetails {
 				: new LinkedHashSet<String>(registeredRedirectUris);
 	}
 
-	@org.codehaus.jackson.annotate.JsonProperty("authorities")
 	@com.fasterxml.jackson.annotation.JsonProperty("authorities")
 	private List<String> getAuthoritiesAsStrings() {
 		return new ArrayList<String>(
 				AuthorityUtils.authorityListToSet(authorities));
 	}
 
-	@org.codehaus.jackson.annotate.JsonProperty("authorities")
-	@org.codehaus.jackson.map.annotate.JsonDeserialize(using = JacksonArrayOrStringDeserializer.class)
 	@com.fasterxml.jackson.annotation.JsonProperty("authorities")
 	@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = Jackson2ArrayOrStringDeserializer.class)
 	private void setAuthoritiesAsStrings(Set<String> values) {
@@ -267,20 +240,17 @@ public class BaseClientDetails implements ClientDetails {
 				.toArray(new String[values.size()])));
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public Collection<GrantedAuthority> getAuthorities() {
 		return authorities;
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public void setAuthorities(
 			Collection<? extends GrantedAuthority> authorities) {
 		this.authorities = new ArrayList<GrantedAuthority>(authorities);
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public Integer getAccessTokenValiditySeconds() {
 		return accessTokenValiditySeconds;
@@ -290,7 +260,6 @@ public class BaseClientDetails implements ClientDetails {
 		this.accessTokenValiditySeconds = accessTokenValiditySeconds;
 	}
 
-	@org.codehaus.jackson.annotate.JsonIgnore
 	@com.fasterxml.jackson.annotation.JsonIgnore
 	public Integer getRefreshTokenValiditySeconds() {
 		return refreshTokenValiditySeconds;
@@ -306,13 +275,11 @@ public class BaseClientDetails implements ClientDetails {
 				additionalInformation);
 	}
 
-	@org.codehaus.jackson.annotate.JsonAnyGetter
 	@com.fasterxml.jackson.annotation.JsonAnyGetter
 	public Map<String, Object> getAdditionalInformation() {
 		return Collections.unmodifiableMap(this.additionalInformation);
 	}
 
-	@org.codehaus.jackson.annotate.JsonAnySetter
 	@com.fasterxml.jackson.annotation.JsonAnySetter
 	public void addAdditionalInformation(String key, Object value) {
 		this.additionalInformation.put(key, value);

+ 0 - 41
maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/JacksonArrayOrStringDeserializer.java

@@ -1,41 +0,0 @@
-package org.maxkey.domain.apps.oauth2.provider.client;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.deser.std.StdDeserializer;
-import org.codehaus.jackson.map.type.SimpleType;
-import org.codehaus.jackson.type.JavaType;
-import org.codehaus.jackson.type.TypeReference;
-import org.springframework.util.StringUtils;
-
-public class JacksonArrayOrStringDeserializer extends StdDeserializer<Set<String>> {
-
-	public JacksonArrayOrStringDeserializer() {
-		super(Set.class);
-	}
-
-	@Override
-	public JavaType getValueType() {
-		return SimpleType.construct(String.class);
-	}
-
-	@Override
-	public Set<String> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException,
-			JsonProcessingException {
-		JsonToken token = jp.getCurrentToken();
-		if (token.isScalarValue()) {
-			String list = jp.getText();
-			list = list.replaceAll("\\s+", ",");
-			return new LinkedHashSet<String>(Arrays.asList(StringUtils.commaDelimitedListToStringArray(list)));
-		}
-		return jp.readValueAs(new TypeReference<Set<String>>() {
-		});
-	}
-}

+ 5 - 4
maxkey-core/src/main/java/org/maxkey/json/JsonDateSerializer.java

@@ -3,12 +3,13 @@ package org.maxkey.json;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.SerializerProvider;
 import org.springframework.stereotype.Component;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
 /**
  * 日期json序列化格式
  * @author Crystal.Sea

+ 5 - 4
maxkey-core/src/main/java/org/maxkey/json/JsonDateTimeDeserializer.java

@@ -5,12 +5,13 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.JsonDeserializer;
 import org.springframework.stereotype.Component;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
 @Component
 public class JsonDateTimeDeserializer   extends JsonDeserializer<Date>{
 	private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

+ 5 - 4
maxkey-core/src/main/java/org/maxkey/json/JsonDateTimeSerializer.java

@@ -3,12 +3,13 @@ package org.maxkey.json;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.SerializerProvider;
 import org.springframework.stereotype.Component;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
 /**
  * 日期时间json序列化格式
  * @author Crystal.Sea

+ 6 - 5
maxkey-core/src/main/java/org/maxkey/json/JsonISODateDeserializer.java

@@ -12,17 +12,18 @@
  */
 package org.maxkey.json;
 
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.JsonDeserializer;
 
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
 /**
  * JSON deserializer for Jackson to handle regular date instances as timestamps in ISO format.
  * 

+ 5 - 4
maxkey-core/src/main/java/org/maxkey/json/JsonISODateSerializer.java

@@ -12,15 +12,16 @@
  */
 package org.maxkey.json;
 
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.SerializerProvider;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
 /**
  * JSON serializer for Jackson to handle regular date instances as timestamps in ISO format.
  * 

+ 3 - 3
maxkey-core/src/main/java/org/maxkey/pretty/impl/JsonPretty.java

@@ -2,11 +2,11 @@ package org.maxkey.pretty.impl;
 
 import java.io.IOException;
 
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.maxkey.pretty.Pretty;
 
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParser;

+ 4 - 7
maxkey-core/src/main/java/org/maxkey/util/JsonUtils.java

@@ -2,14 +2,11 @@ package org.maxkey.util;
 
 import java.io.IOException;
 
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonParser;
 
 public class JsonUtils {
 

+ 4 - 0
maxkey-dao/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.source=1.8

+ 20 - 0
maxkey-dao/.settings/org.eclipse.wst.validation.prefs

@@ -0,0 +1,20 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.800.v201904082137
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.jst.jsf.facelet.ui.FaceletHTMLValidator/global=FF01
+vals/org.eclipse.jst.jsf.ui.JSFAppConfigValidator/global=FF01
+vals/org.eclipse.jst.jsp.core.JSPBatchValidator/global=FF01
+vals/org.eclipse.jst.jsp.core.JSPContentValidator/global=FF01
+vals/org.eclipse.jst.jsp.core.TLDValidator/global=FF01
+vals/org.eclipse.wst.dtd.core.dtdDTDValidator/global=FF01
+vals/org.eclipse.wst.html.core.HTMLValidator/global=FF01
+vals/org.eclipse.wst.json.core.json/global=FF03
+vals/org.eclipse.wst.wsdl.validation.wsdl/global=FF02158org.eclipse.wst.wsdl.validation.internal.eclipse.Validator
+vals/org.eclipse.wst.xml.core.xml/global=FF03
+vals/org.eclipse.wst.xsd.core.xsd/global=FF02162org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator
+vals/org.eclipse.wst.xsl.core.xsl/global=FF02
+vf.version=3

+ 0 - 6
maxkey-demos/.classpath

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>

+ 0 - 23
maxkey-demos/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>maxkey-demos</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

+ 0 - 11
maxkey-demos/.settings/org.eclipse.buildship.core.prefs

@@ -1,11 +0,0 @@
-build.commands=org.eclipse.jdt.core.javabuilder
-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/
-derived.resources=.gradle,build
-eclipse.preferences.version=1
-natures=org.eclipse.jdt.core.javanature
-project.path=\:maxkey-demos

+ 0 - 2
maxkey-demos/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

+ 0 - 17
maxkey-demos/maxkey-demo-cas/.classpath

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="bin/main" path="src/main/java">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>

+ 0 - 36
maxkey-demos/maxkey-demo-cas/.project

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>maxkey-demo-cas</name>
-	<comment>maxkey-demo-cas</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

+ 0 - 11
maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.buildship.core.prefs

@@ -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-demos\:maxkey-demo-cas

+ 0 - 2
maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

+ 0 - 8
maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.wst.common.component

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="maxkey-demo-cas">
-		<property name="context-root" value="demo-cas"/>
-		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
-		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
-	</wb-module>
-</project-modules>

+ 0 - 7
maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-	<fixed facet="jst.java"/>
-	<fixed facet="jst.web"/>
-	<installed facet="jst.web" version="2.4"/>
-	<installed facet="jst.java" version="1.8"/>
-</faceted-project>

+ 0 - 21
maxkey-demos/maxkey-demo-cas/build.gradle

@@ -1,21 +0,0 @@
-description = "maxkey-demo-cas"
-
-apply plugin: 'war'
-apply plugin: 'eclipse-wtp'
-
-dependencies {
-   compile fileTree(dir: 'lib/', include: '*.jar')
-}
-
-eclipse {
-
-	wtp {
-		component {
-      
-      	//define context path, default to project folder name
-      	contextPath = 'demo-cas'
-      
-		}	
-    
-	}
-}

binární
maxkey-demos/maxkey-demo-cas/lib/cas-client-core-3.2.1.jar


binární
maxkey-demos/maxkey-demo-cas/lib/commons-codec-1.4.jar


binární
maxkey-demos/maxkey-demo-cas/lib/commons-logging-1.1.1.jar


binární
maxkey-demos/maxkey-demo-cas/lib/slf4j-api-1.5.11.jar


+ 0 - 3
maxkey-demos/maxkey-demo-cas/src/main/webapp/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

+ 0 - 78
maxkey-demos/maxkey-demo-cas/src/main/webapp/WEB-INF/web.xml

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
-	<display-name></display-name>
-	<listener>
-		<listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class>
-	</listener>
-	<filter>
-		<filter-name>CAS Single Sign Out Filter</filter-name>
-		<filter-class>org.jasig.cas.client.session.SingleSignOutFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>CAS Single Sign Out Filter</filter-name>
-		<url-pattern>/index.jsp</url-pattern>
-	</filter-mapping>
-	<filter>
-		<filter-name>CAS Filter</filter-name>
-		<filter-class>org.jasig.cas.client.authentication.AuthenticationFilter</filter-class>
-		<!-- cas server login url -->
-		<init-param>
-			<param-name>casServerLoginUrl</param-name>
-			<param-value>>http://sso.maxkey.org/maxkey/authz/cas/</param-value>
-		</init-param>
-		<!-- cas client url, in end of url / is required -->
-		<init-param>
-			<param-name>serverName</param-name>
-			<param-value>http://casdemo.maxkey.org/</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>CAS Filter</filter-name>
-		<url-pattern>/index.jsp</url-pattern>
-	</filter-mapping>
-
-	<!-- Cas10TicketValidationFilter Cas20ProxyReceivingTicketValidationFilter -->
-	<filter>
-		<filter-name>CAS Validation Filter</filter-name>
-		<filter-class>org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter</filter-class>
-		<!-- cas server login url -->
-		<init-param>
-			<param-name>casServerUrlPrefix</param-name>
-			<param-value>http://sso.maxkey.org/maxkey/authz/cas/</param-value>
-		</init-param>
-		<!-- cas client url -->
-		<init-param>
-			<param-name>serverName</param-name>
-			<param-value>http://casdemo.maxkey.org/</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>CAS Validation Filter</filter-name>
-		<url-pattern>/index.jsp</url-pattern>
-	</filter-mapping>
-	<filter>
-		<filter-name>CAS HttpServletRequest Wrapper Filter</filter-name>
-		<filter-class>
-			org.jasig.cas.client.util.HttpServletRequestWrapperFilter
-		</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>CAS HttpServletRequest Wrapper Filter</filter-name>
-		<url-pattern>/index.jsp</url-pattern>
-	</filter-mapping>
-	<filter>
-		<filter-name>CAS Assertion Thread Local Filter</filter-name>
-		<filter-class>org.jasig.cas.client.util.AssertionThreadLocalFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>CAS Assertion Thread Local Filter</filter-name>
-		<url-pattern>/index.jsp</url-pattern>
-	</filter-mapping>
-	<welcome-file-list>
-		<welcome-file>index.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>

binární
maxkey-demos/maxkey-demo-cas/src/main/webapp/images/cas.png


binární
maxkey-demos/maxkey-demo-cas/src/main/webapp/images/favicon.ico


+ 0 - 115
maxkey-demos/maxkey-demo-cas/src/main/webapp/index.jsp

@@ -1,115 +0,0 @@
-<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
-<%@ page language="java" import="java.util.Map.Entry" %>
-<%@ page language="java" import="org.apache.commons.codec.binary.Base64" %>
-<%@ page language="java" import="org.jasig.cas.client.authentication.AttributePrincipal" %>
-<%@ page language="java" import="org.jasig.cas.client.validation.Assertion" %>
-<%@ page language="java" import="org.jasig.cas.client.util.AbstractCasFilter" %>
-<%
-	String path = request.getContextPath();
-	String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-	System.out.println("CAS Assertion Success . ");
-	Assertion assertion = (Assertion) request.getSession().getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION);
-	                
-	                
-	String username=     assertion.getPrincipal().getName();
-%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>Demo CAS</title>
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="CAS Demo">
-	<link rel="shortcut icon" type="image/x-icon" href="<%=basePath %>/images/favicon.ico"/>
-	<!--
-	<link rel="stylesheet" type="text/css" href="styles.css">
-	-->
-	<style type="text/css">
-		body{
-			margin: 0;
-			margin-top: 0px;
-			margin-left: auto;
-			margin-right: auto;
-			padding: 0 0 0 0px;
-			font-size: 12px;
-			text-align:center;
-			float:center;
-			font-family: "Arial", "Helvetica", "Verdana", "sans-serif";
-		}
-		.container {
-			width: 990px;
-			margin-left: auto;
-			margin-right: auto;
-			padding: 0 10px
-		}
-		table.datatable {
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			width: 100%;
-		}
-		
-		table.datatable th{
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			height: 40px;
-		}
-		
-		
-		table.datatable td{
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			height: 40px;
-		}
-		
-		table.datatable td.title{
-			text-align: center;
-			font-size: 20px;
-			font-weight: bold;
-		}
-	</style>
-  </head>
-  
-  <body>
-  		<div class="container">
-	  		<table class="datatable">
-	  			<tr>
-	  				<td colspan="2" class="title">CAS Demo for MaxKey</td>
-	  			</tr>
-	  			<tr>
-	  				<td>CAS Logo</td>
-	  				<td> <img src="<%=basePath %>/images/cas.png"/></td>
-	  			</tr>
-	  			<tr>
-	  				<td width="50%">CAS Assertion</td>
-	  				<td><%=username %></td>
-	  			</tr>
-	  			<tr>
-	  				<td>CAS Has Attributes </td>
-	  				<td><%=!assertion.getPrincipal().getAttributes().isEmpty() %> size : <%=assertion.getPrincipal().getAttributes().size() %></td>
-	  			</tr>
-	  			<%
-		  			Map<String, Object> attMap = assertion.getPrincipal().getAttributes();  
-		            for (Entry<String, Object> entry : attMap.entrySet()) {   
-		            	String attributeValue=entry.getValue()==null?"":entry.getValue().toString();
-		            	System.out.println("attributeValue : "+attributeValue);
-		            	if(attributeValue.startsWith("base64:")){
-		            		attributeValue=new String(Base64.decodeBase64(attributeValue.substring("base64:".length())),"UTF-8");
-		            	}
-		        %>
-	  			<tr>
-	  				<td>CAS <%=entry.getKey() %> </td>
-	  				<td><%=attributeValue %></td>
-	  			</tr>
-	  			<%}%>
-	  		</table>
-  		</div>
-  </body>
-</html>

+ 0 - 72
maxkey-demos/maxkey-demo-cas/src/main/webapp/test.html

@@ -1,72 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>Demo CAS</title>
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="CAS Demo">
-	<!--
-	<link rel="stylesheet" type="text/css" href="styles.css">
-	-->
-	<style type="text/css">
-		body{
-			margin: 0;
-			margin-top: 0px;
-			margin-left: auto;
-			margin-right: auto;
-			padding: 0 0 0 0px;
-			font-size: 12px;
-			text-align:center;
-			float:center;
-			font-family: "Arial", "Helvetica", "Verdana", "sans-serif";
-		}
-		.container {
-			width: 990px;
-			margin-left: auto;
-			margin-right: auto;
-			padding: 0 10px
-		}
-		table.datatable {
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			width: 100%;
-		}
-		
-		table.datatable th{
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			height: 40px;
-		}
-		
-		
-		table.datatable td{
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			height: 40px;
-		}
-		
-		table.datatable td.title{
-			text-align: center;
-			font-size: 20px;
-			font-weight: bold;
-		}
-	</style>
-  </head>
-  
-  <body>
-  		<div class="container">
-	  		<table class="datatable">
-	  			<tr>
-	  				<td colspan="2" class="title">CAS Demo for MaxKey Test</td>
-	  			</tr>
-	  		</table>
-  		</div>
-  </body>
-</html>

+ 0 - 23
maxkey-demos/maxkey-demo-jwt/.classpath

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="bin/main" path="src/main/java">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="bin/main" path="src/main/resources">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>

+ 0 - 7
maxkey-demos/maxkey-demo-jwt/.externalToolBuilders/org.eclipse.wst.common.project.facet.core.builder (1).launch

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.wst.common.project.facet.core.builder"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>

+ 0 - 36
maxkey-demos/maxkey-demo-jwt/.project

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>maxkey-demo-jwt</name>
-	<comment>maxkey-demo-jwt</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

+ 0 - 11
maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.buildship.core.prefs

@@ -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-demos\:maxkey-demo-jwt

+ 0 - 2
maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

+ 0 - 9
maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.wst.common.component

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="maxkey-demo-jwt">
-		<property name="context-root" value="demo-jwt"/>
-		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
-		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
-	</wb-module>
-</project-modules>

+ 0 - 7
maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-	<fixed facet="jst.java"/>
-	<fixed facet="jst.web"/>
-	<installed facet="jst.web" version="2.4"/>
-	<installed facet="jst.java" version="1.8"/>
-</faceted-project>

+ 0 - 12
maxkey-demos/maxkey-demo-jwt/bin/main/jwk.jwks

@@ -1,12 +0,0 @@
-{
-  "keys": [
-    {
-      "kty": "RSA",
-	  "e": "AQAB",
-      "use": "sig",
-      "kid": "maxkey_rsa",
-      "alg": "RS256",
-      "n": "vyfZwQuBLNvJDhmziUCFuAfIv-bC6ivodcR6PfanTt8XLd6G63Yx10YChAdsDACjoLz1tEU56WPp_ee_vcTSsEZT3ouWJYghuGI2j4XclXlEj0S7DzdpcBBpI4n5dr8K3iKY-3JUMZR1AMBHI50UaMST9ZTZJAjUPIYxkhRdca5lWBo4wGUh1yj_80-Bq6al0ia9S5NTzNLaJ18jSxFqZ79BAkBm-KjkP248YUk6WBGtYEAV5Fws4dpse4hrqJ3RRHiMZV1o1iTmPHz_l55ZSDP3vpYf6iKqKzoK2RmdjfH5mGpbc4-PclTs4GKfwZ7cWfrny6B7sMnQfzujCH996Q"
-    }
-  ]
-}

+ 0 - 20
maxkey-demos/maxkey-demo-jwt/build.gradle

@@ -1,20 +0,0 @@
-description = "maxkey-demo-jwt"
-
-apply plugin: 'war'
-apply plugin: 'eclipse-wtp'
-
-dependencies {
-   compile fileTree(dir: 'lib/', include: '*.jar')
-}
-eclipse {
-
-	wtp {
-		component {
-      
-      	//define context path, default to project folder name
-      	contextPath = 'demo-jwt'
-      
-		}	
-    
-	}
-}

binární
maxkey-demos/maxkey-demo-jwt/lib/commons-codec-1.9.jar


binární
maxkey-demos/maxkey-demo-jwt/lib/commons-io-2.2.jar


binární
maxkey-demos/maxkey-demo-jwt/lib/commons-logging-1.1.1.jar


binární
maxkey-demos/maxkey-demo-jwt/lib/gson-2.2.4.jar


binární
maxkey-demos/maxkey-demo-jwt/lib/json-smart-1.2.jar


binární
maxkey-demos/maxkey-demo-jwt/lib/log4j-1.2.17.jar


binární
maxkey-demos/maxkey-demo-jwt/lib/maxkey-client-sdk.jar


binární
maxkey-demos/maxkey-demo-jwt/lib/maxkey-jose-jwt.jar


+ 0 - 2
maxkey-demos/maxkey-demo-jwt/src/META-INF/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-

+ 0 - 12
maxkey-demos/maxkey-demo-jwt/src/main/resources/jwk.jwks

@@ -1,12 +0,0 @@
-{
-  "keys": [
-    {
-      "kty": "RSA",
-	  "e": "AQAB",
-      "use": "sig",
-      "kid": "maxkey_rsa",
-      "alg": "RS256",
-      "n": "vyfZwQuBLNvJDhmziUCFuAfIv-bC6ivodcR6PfanTt8XLd6G63Yx10YChAdsDACjoLz1tEU56WPp_ee_vcTSsEZT3ouWJYghuGI2j4XclXlEj0S7DzdpcBBpI4n5dr8K3iKY-3JUMZR1AMBHI50UaMST9ZTZJAjUPIYxkhRdca5lWBo4wGUh1yj_80-Bq6al0ia9S5NTzNLaJ18jSxFqZ79BAkBm-KjkP248YUk6WBGtYEAV5Fws4dpse4hrqJ3RRHiMZV1o1iTmPHz_l55ZSDP3vpYf6iKqKzoK2RmdjfH5mGpbc4-PclTs4GKfwZ7cWfrny6B7sMnQfzujCH996Q"
-    }
-  ]
-}

+ 0 - 3
maxkey-demos/maxkey-demo-jwt/src/main/webapp/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

+ 0 - 35
maxkey-demos/maxkey-demo-jwt/src/main/webapp/WEB-INF/web.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
-  <display-name></display-name>
-  <!-- 
-  	<filter>
-	   	<filter-name>authenticationFilter</filter-name>
-	   	<filter-class>com.connsec.web.authn.AuthenticationFilter</filter-class>
-	   	<init-param>
-	    	<param-name>clientId</param-name>
-	    	<param-value>b32834accb544ea7a9a09dcae4a36403</param-value>
-	   	</init-param>
-	   	<init-param>
-	    	<param-name>clientSecret</param-name>
-	    	<param-value>E9UO53P3JH52aQAcnLP2FlLv8olKIB7u</param-value>
-	   	</init-param>
-	   	<init-param>
-	    	<param-name>callBackUri</param-name>
-	    	<param-value>http://oauth.demo.connsec.com:8080/oauthdemo/oauth20callback.jsp</param-value>
-	   	</init-param>
-	   	<init-param>
-	    	<param-name>enable</param-name>
-	    	<param-value>true</param-value>
-	   	</init-param>
-	</filter>
-	
-	<filter-mapping>
-  		<filter-name>authenticationFilter</filter-name>
-   		<url-pattern>/oauth20callback.jsp</url-pattern>
-	</filter-mapping>
-	
-	 -->
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-</web-app>

binární
maxkey-demos/maxkey-demo-jwt/src/main/webapp/images/favicon.ico


binární
maxkey-demos/maxkey-demo-jwt/src/main/webapp/images/jwt.png


+ 0 - 30
maxkey-demos/maxkey-demo-jwt/src/main/webapp/index.jsp

@@ -1,30 +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+"/";
-
-
-%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>My JSP 'index.jsp' starting page</title>
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="This is my page">
-	<!--
-	<link rel="stylesheet" type="text/css" href="styles.css">
-	-->
-  </head>
-  
-  <body>
-    <a href="oauth10aindex.jsp">oauth 1.0a sso</a><br>
-     <a href="oauth20index.jsp">oauth 2.0 sso</a>
-  </body>
-</html>

+ 0 - 153
maxkey-demos/maxkey-demo-jwt/src/main/webapp/jwtcallback.jsp

@@ -1,153 +0,0 @@
-<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
-<%@ page language="java" import="org.maxkey.client.oauth.oauth.*" %>
-<%@ page language="java" import="org.maxkey.client.oauth.builder.*" %>
-<%@ page language="java" import="org.maxkey.client.oauth.builder.api.ConnsecApi20" %>
-<%@ page language="java" import="org.maxkey.client.oauth.model.*" %>
-<%@ page language="java" import="org.maxkey.client.utils.*" %>
-<%@ page language="java" import="com.nimbusds.jwt.JWTClaimsSet" %>
-<%@ page language="java" import="com.nimbusds.jose.*" %>
-<%@ page language="java" import="com.nimbusds.jwt.*" %>
-<%@ page language="java" import="com.connsec.oidc.jose.keystore.*" %>
-<%@ page language="java" import="com.nimbusds.jose.jwk.*" %>
-<%@ page language="java" import="java.io.File" %>
-<%@ page language="java" import="com.nimbusds.jose.crypto.*" %>
-<%@ page language="java" import="com.google.gson.*" %>
-
-
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-String token=request.getParameter("jwt");
-System.out.println("jwt "+token);
-SignedJWT signedJWT=null;
-
-//JWKSetKeyStore jwkSetKeyStore=new JWKSetKeyStore();
-
-File jwksFile=new File(PathUtils.getInstance().getClassPath()+"jwk.jwks");
-JWKSet jwkSet=JWKSet.load(jwksFile);
-
-RSASSAVerifier rsaSSAVerifier = new RSASSAVerifier(((RSAKey) jwkSet.getKeyByKeyId("maxkey_rsa")).toRSAPublicKey());
-try {
-
-    signedJWT = SignedJWT.parse(token);
-} catch (java.text.ParseException e) {
-    // Invalid signed JWT encoding
-}
-
-System.out.println("signedJWT "+signedJWT);
-
-JWTClaimsSet jwtClaims =signedJWT.getJWTClaimsSet();
- 
-%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-   <title>JWT 1.0 Demo</title>
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="JWT 1.0 Demo">
-	<link rel="shortcut icon" type="image/x-icon" href="<%=basePath %>/images/favicon.ico"/>
-	
-	<style type="text/css">
-		body{
-			margin: 0;
-			margin-top: 0px;
-			margin-left: auto;
-			margin-right: auto;
-			padding: 0 0 0 0px;
-			font-size: 12px;
-			text-align:center;
-			float:center;
-			font-family: "Arial", "Helvetica", "Verdana", "sans-serif";
-		}
-		.container {
-			width: 990px;
-			margin-left: auto;
-			margin-right: auto;
-			padding: 0 10px
-		}
-		table.datatable {
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			width: 100%;
-			table-layout:fixed;
-		}
-		
-		table.datatable th{
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			height: 40px;
-		}
-		
-		
-		table.datatable td{
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			height: 40px;
-		}
-		
-		table.datatable td.title{
-			text-align: center;
-			font-size: 20px;
-			font-weight: bold;
-		}
-	</style>
-  </head>
-  
-  <body>
-  		<div class="container">
-	  		<table class="datatable">
-	  			<tr>
-	  				
-	  				<td colspan="2" class="title">JSON Web Token (JWT) 1.0 Demo</td>
-	  			</tr>
-	  			
-	  			<tr>
-	  				<td>JWT 1.0 Logo</td>
-	  				<td> <img src="<%=basePath %>/images/jwt.png"  width="124px" height="124px"/></td>
-	  			</tr>
-	  			<tr>
-	  				<td>Issuer</td>
-	  				<td><%=jwtClaims.getIssuer() %></td>
-	  			</tr>
-	  			<tr>
-	  				<td>Subject</td>
-	  				<td><%=jwtClaims.getSubject()%></td>
-	  			</tr>
-	  			<tr>
-	  				<td>Audience</td>
-	  				<td><%=jwtClaims.getAudience() %></td>
-	  			</tr>
-	  			
-	  			<tr>
-	  				<td>ExpirationTime</td>
-	  				<td><%=jwtClaims.getExpirationTime() %></td>
-	  			</tr>
-	  			<tr>
-	  				<td>JWTID</td>
-	  				<td style="word-wrap: break-word;"><%=jwtClaims.getJWTID() %></td>
-	  			</tr>
-	  			<tr>
-	  				<td>IssueTime</td>
-	  				<td style="word-wrap: break-word;"><%=jwtClaims.getIssueTime() %></td>
-	  			</tr>
-	  			<tr>
-	  				<td>JWTClaims</td>
-	  				<td style="word-wrap: break-word;"><%=signedJWT.getPayload() %></td>
-	  			</tr>
-	  			<tr>
-	  				<td>Verify</td>
-	  				<td style="word-wrap: break-word;"><%=signedJWT.verify(rsaSSAVerifier) %></td>
-	  			</tr>
-	  		</table>
-  		</div> 
-  </body>
-</html>

+ 0 - 17
maxkey-demos/maxkey-demo-ltpa/.classpath

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="bin/main" path="src/main/java">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>

+ 0 - 36
maxkey-demos/maxkey-demo-ltpa/.project

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>maxkey-demo-ltpa</name>
-	<comment>maxkey-demo-ltpa</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

+ 0 - 11
maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.buildship.core.prefs

@@ -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-demos\:maxkey-demo-ltpa

+ 0 - 2
maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

+ 0 - 8
maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.wst.common.component

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="maxkey-demo-ltpa">
-		<property name="context-root" value="demo-ltpa"/>
-		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
-		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
-	</wb-module>
-</project-modules>

+ 0 - 7
maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-	<fixed facet="jst.java"/>
-	<fixed facet="jst.web"/>
-	<installed facet="jst.web" version="2.4"/>
-	<installed facet="jst.java" version="1.8"/>
-</faceted-project>

+ 0 - 20
maxkey-demos/maxkey-demo-ltpa/build.gradle

@@ -1,20 +0,0 @@
-description = "maxkey-demo-ltpa"
-
-apply plugin: 'war'
-apply plugin: 'eclipse-wtp'
-
-dependencies {
-   compile fileTree(dir: 'lib/', include: '*.jar')
-}
-eclipse {
-
-	wtp {
-		component {
-      
-      	//define context path, default to project folder name
-      	contextPath = 'demo-ltpa'
-      
-		}	
-    
-	}
-}

binární
maxkey-demos/maxkey-demo-ltpa/lib/commons-codec-1.9.jar


binární
maxkey-demos/maxkey-demo-ltpa/lib/commons-logging-1.1.1.jar


binární
maxkey-demos/maxkey-demo-ltpa/lib/gson-2.2.4.jar


binární
maxkey-demos/maxkey-demo-ltpa/lib/log4j-1.2.17.jar


binární
maxkey-demos/maxkey-demo-ltpa/lib/maxkey-client-sdk.jar


+ 0 - 2
maxkey-demos/maxkey-demo-ltpa/src/META-INF/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-

+ 0 - 3
maxkey-demos/maxkey-demo-ltpa/src/main/webapp/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

+ 0 - 2
maxkey-demos/maxkey-demo-ltpa/src/main/webapp/WEB-INF/classes/META-INF/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-

+ 0 - 11
maxkey-demos/maxkey-demo-ltpa/src/main/webapp/WEB-INF/web.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0" 
-	xmlns="http://java.sun.com/xml/ns/javaee" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
-	http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-  <display-name></display-name>	
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-</web-app>

binární
maxkey-demos/maxkey-demo-ltpa/src/main/webapp/images/favicon.ico


binární
maxkey-demos/maxkey-demo-ltpa/src/main/webapp/images/ltpa.png


+ 0 - 26
maxkey-demos/maxkey-demo-ltpa/src/main/webapp/index.jsp

@@ -1,26 +0,0 @@
-<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>My JSP 'index.jsp' starting page</title>
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="This is my page">
-	<!--
-	<link rel="stylesheet" type="text/css" href="styles.css">
-	-->
-  </head>
-  
-  <body>
-    This is my JSP page. <br>
-  </body>
-</html>

+ 0 - 120
maxkey-demos/maxkey-demo-ltpa/src/main/webapp/ltpa.jsp

@@ -1,120 +0,0 @@
-<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
-<%@ page language="java" import="org.maxkey.client.ltpa.*"%>
-<%@ page language="java" import="org.maxkey.client.crypto.*"%>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-
-String ltpaVaule=LtpaUtils.readLtpa(request, "connsec.com", "ltpa");
-System.out.println("============"+ltpaVaule);
-Map tokenMap=null;
-if(ltpaVaule!=null){
-	String ltpaString=LtpaUtils.decode(ltpaVaule, "h560BIVz", ReciprocalUtils.Algorithm.DES);
-	tokenMap=LtpaUtils.parseLtpaJson(ltpaString);
-}
-
-//
-
-%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-   <title>LTPA Demo</title>
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="LTPA Demo">
-	<link rel="shortcut icon" type="image/x-icon" href="<%=basePath %>/images/favicon.ico"/>
-	
-	<style type="text/css">
-		body{
-			margin: 0;
-			margin-top: 0px;
-			margin-left: auto;
-			margin-right: auto;
-			padding: 0 0 0 0px;
-			font-size: 12px;
-			text-align:center;
-			float:center;
-			font-family: "Arial", "Helvetica", "Verdana", "sans-serif";
-		}
-		.container {
-			width: 990px;
-			margin-left: auto;
-			margin-right: auto;
-			padding: 0 10px
-		}
-		table.datatable {
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			width: 100%;
-		}
-		
-		table.datatable th{
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			height: 40px;
-		}
-		
-		
-		table.datatable td{
-			border: 1px solid #d8dcdf;
-			border-collapse:collapse;
-			border-spacing:0;
-			height: 40px;
-		}
-		
-		table.datatable td.title{
-			text-align: center;
-			font-size: 20px;
-			font-weight: bold;
-		}
-	</style>
-  </head>
-  
-  <body>
-  		<div class="container">
-	  		<table class="datatable">
-	  			<tr>
-	  				
-	  				<td colspan="2" class="title">LTPA Demo</td>
-	  			</tr>
-	  			
-	  			<tr>
-	  				<td>LTPA Logo</td>
-	  				<td> <img src="<%=basePath %>images/ltpa.png" width="124px" height="124px"/></td>
-	  			</tr>
-	  			<tr>
-	  				<td>UID</td>
-	  				<td><%=tokenMap.get("uid") %></td>
-	  			</tr>
-	  			<tr>
-	  				<td>UserName</td>
-	  				<td><%=tokenMap.get("username") %></td>
-	  			</tr>
-	  			<tr>
-	  				<td>Department</td>
-	  				<td><%=tokenMap.get("department") %></td>
-	  			</tr>
-	  			<tr>
-	  				<td>Email</td>
-	  				<td><%=tokenMap.get("email") %></td>
-	  			</tr>
-	  			<tr>
-	  				<td>Authentication at Time</td>
-	  				<td><%=tokenMap.get("at")%></td>
-	  			</tr>
-	  			<tr>
-	  				<td>Expires</td>
-	  				<td><%=tokenMap.get("expires")%></td>
-	  			</tr>
-	  		</table>
-  		</div>
-  </body>
-</html>

+ 0 - 23
maxkey-demos/maxkey-demo-oauth/.classpath

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="bin/main" path="src/main/java">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="bin/main" path="src/main/resources">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>

+ 0 - 36
maxkey-demos/maxkey-demo-oauth/.project

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>maxkey-demo-oauth</name>
-	<comment>maxkey-demo-oauth</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

+ 0 - 11
maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.buildship.core.prefs

@@ -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-demos\:maxkey-demo-oauth

+ 0 - 2
maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

+ 0 - 9
maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.wst.common.component

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="maxkey-demo-oauth">
-		<property name="context-root" value="demo-oauth"/>
-		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
-		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
-	</wb-module>
-</project-modules>

+ 0 - 7
maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-	<fixed facet="jst.java"/>
-	<fixed facet="jst.web"/>
-	<installed facet="jst.web" version="2.4"/>
-	<installed facet="jst.java" version="1.8"/>
-</faceted-project>

+ 0 - 12
maxkey-demos/maxkey-demo-oauth/bin/main/jwk.jwks

@@ -1,12 +0,0 @@
-{
-  "keys": [
-    {
-      "e": "AQAB",
-      "n": "h5xtDWLssoj5-WLCKPYPUDJlM5pnL4pS8-wMt9sVA57QVRVFdpWHi1dbDCugCApjvmD-giO5yjF5mQSTAF6a14FvktozVw_dDTEzrjG5FgT6WpMzMZd6JpiwQLOtEbV7oBkKYWm1vh1C67-xTlhKgQUNLVNDg4RqRcKFxZd5JPc",
-      "kty": "RSA",
-      "use": "sig",
-      "alg": "RS256",
-      "kid": "connsec_rsa"
-    }
-  ]
-}

+ 0 - 20
maxkey-demos/maxkey-demo-oauth/build.gradle

@@ -1,20 +0,0 @@
-description = "maxkey-demo-oauth"
-
-apply plugin: 'war'
-apply plugin: 'eclipse-wtp'
-
-dependencies {
-   compile fileTree(dir: 'lib/', include: '*.jar')
-}
-eclipse {
-
-	wtp {
-		component {
-      
-      	//define context path, default to project folder name
-      	contextPath = 'demo-oauth'
-      
-		}	
-    
-	}
-}

binární
maxkey-demos/maxkey-demo-oauth/lib/commons-codec-1.9.jar


binární
maxkey-demos/maxkey-demo-oauth/lib/commons-io-2.2.jar


binární
maxkey-demos/maxkey-demo-oauth/lib/commons-logging-1.1.1.jar


binární
maxkey-demos/maxkey-demo-oauth/lib/connsec-oidc.jar


binární
maxkey-demos/maxkey-demo-oauth/lib/gson-2.2.4.jar


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů