} tag looks up a message in the scope of this page.
+ * Messages are resolved using the ApplicationContext and thus support
+ * internationalization.
*
+ * Detects an HTML escaping setting, either on this tag instance, the page level,
+ * or the {@code web.xml} level. Can also apply JavaScript escaping.
+ *
+ *
If "code" isn't set or cannot be resolved, "text" will be used as default
+ * message. Thus, this tag can also be used for HTML escaping of any texts.
+ *
+ *
Message arguments can be specified via the {@link #setArguments(Object) arguments}
+ * attribute or by using nested {@code } tags.
+ *
+ *
+ * Attribute Summary
+ *
+ *
+ * Attribute
+ * Required?
+ * Runtime Expression?
+ * Description
+ *
+ *
+ *
+ *
+ * arguments
+ * false
+ * true
+ * Set optional message arguments for this tag, as a (comma-)delimited
+ * String (each String argument can contain JSP EL), an Object array (used as
+ * argument array), or a single Object (used as single argument).
+ *
+ *
+ * argumentSeparator
+ * false
+ * true
+ * The separator character to be used for splitting the arguments string
+ * value; defaults to a 'comma' (',').
+ *
+ *
+ * code
+ * false
+ * true
+ * The code (key) to use when looking up the message.
+ * If code is not provided, the text attribute will be used.
+ *
+ *
+ * htmlEscape
+ * false
+ * true
+ * Set HTML escaping for this tag, as boolean value.
+ * Overrides the default HTML escaping setting for the current page.
+ *
+ *
+ * javaScriptEscape
+ * false
+ * true
+ * Set JavaScript escaping for this tag, as boolean value.
+ * Default is false.
+ *
+ *
+ * message
+ * false
+ * true
+ * A MessageSourceResolvable argument (direct or through JSP EL).
+ * Fits nicely when used in conjunction with Spring’s own validation error
+ * classes which all implement the MessageSourceResolvable interface.
+ * For example, this allows you to iterate over all of the errors in a form,
+ * passing each error (using a runtime expression) as the value of this
+ * 'message' attribute, thus effecting the easy display of such error
+ * messages.
+ *
+ *
+ * scope
+ * false
+ * true
+ * The scope to use when exporting the result to a variable. This attribute
+ * is only used when var is also set. Possible values are page, request, session
+ * and application.
+ *
+ *
+ * text
+ * false
+ * true
+ * Default text to output when a message for the given code could not be
+ * found. If both text and code are not set, the tag will output null.
+ *
+ *
+ * var
+ * false
+ * true
+ * The string to use when binding the result to the page, request, session
+ * or application scope. If not specified, the result gets outputted to the writer
+ * (i.e. typically directly to the JSP).
+ *
+ *
+ *
+ *
+ * @author Rod Johnson
+ * @author Juergen Hoeller
+ * @author Nicholas Williams
+ * @see #setCode
+ * @see #setText
+ * @see #setHtmlEscape
+ * @see #setJavaScriptEscape
+ * @see HtmlEscapeTag#setDefaultHtmlEscape
+ * @see org.springframework.web.util.WebUtils#HTML_ESCAPE_CONTEXT_PARAM
+ * @see ArgumentTag
*/
-public class LocaleTag extends TagSupport{
+@SuppressWarnings("serial")
+public class LocaleTag extends HtmlEscapingAwareTag implements ArgumentAware {
/**
- *
+ * Default separator for splitting an arguments String: a comma (",").
*/
- private static final long serialVersionUID = -3906613920420893358L;
-
- private PageContext pageContext;
-
+ public static final String DEFAULT_ARGUMENT_SEPARATOR = ",";
+
+
+ @Nullable
+ private MessageSourceResolvable message;
+
+ @Nullable
private String code;
-
-
+
+ @Nullable
+ private Object arguments;
+
+ private String argumentSeparator = DEFAULT_ARGUMENT_SEPARATOR;
+
+ private List nestedArguments = Collections.emptyList();
+
+ @Nullable
+ private String text;
+
+ @Nullable
+ private String var;
+
+ private String scope = TagUtils.SCOPE_PAGE;
+
+ private boolean javaScriptEscape = false;
+
/**
- * @param code the code to set
+ * Set the MessageSourceResolvable for this tag.
+ * If a MessageSourceResolvable is specified, it effectively overrides
+ * any code, arguments or text specified on this tag.
+ */
+ public void setMessage(MessageSourceResolvable message) {
+ this.message = message;
+ }
+
+ /**
+ * Set the message code for this tag.
*/
public void setCode(String code) {
this.code = code;
}
- public void setPageContext(PageContext pageContext) {
- this.pageContext = pageContext;
+ /**
+ * Set optional message arguments for this tag, as a comma-delimited
+ * String (each String argument can contain JSP EL), an Object array
+ * (used as argument array), or a single Object (used as single argument).
+ */
+ public void setArguments(Object arguments) {
+ this.arguments = arguments;
}
-
- public final int doStartTag() throws JspException{
- return SKIP_BODY;
+
+ /**
+ * Set the separator to use for splitting an arguments String.
+ * Default is a comma (",").
+ * @see #setArguments
+ */
+ public void setArgumentSeparator(String argumentSeparator) {
+ this.argumentSeparator = argumentSeparator;
}
+
+ @Override
+ public void addArgument(@Nullable Object argument) throws JspTagException {
+ this.nestedArguments.add(argument);
+ }
+
+ /**
+ * Set the message text for this tag.
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * Set PageContext attribute name under which to expose
+ * a variable that contains the resolved message.
+ * @see #setScope
+ * @see javax.servlet.jsp.PageContext#setAttribute
+ */
+ public void setVar(String var) {
+ this.var = var;
+ }
+
+ /**
+ * Set the scope to export the variable to.
+ * Default is SCOPE_PAGE ("page").
+ * @see #setVar
+ * @see org.springframework.web.util.TagUtils#SCOPE_PAGE
+ * @see javax.servlet.jsp.PageContext#setAttribute
+ */
+ public void setScope(String scope) {
+ this.scope = scope;
+ }
+
+ /**
+ * Set JavaScript escaping for this tag, as boolean value.
+ * Default is "false".
+ */
+ public void setJavaScriptEscape(boolean javaScriptEscape) throws JspException {
+ this.javaScriptEscape = javaScriptEscape;
+ }
+
+
+ @Override
+ protected final int doStartTagInternal() throws JspException, IOException {
+ this.nestedArguments = new LinkedList<>();
+ return EVAL_BODY_INCLUDE;
+ }
+
+ /**
+ * Resolves the message, escapes it if demanded,
+ * and writes it to the page (or exposes it as variable).
+ * @see #resolveMessage()
+ * @see org.springframework.web.util.HtmlUtils#htmlEscape(String)
+ * @see org.springframework.web.util.JavaScriptUtils#javaScriptEscape(String)
+ * @see #writeMessage(String)
+ */
+ @Override
+ public int doEndTag() throws JspException {
+ try {
+ if(code==null) {
+ pageContext.getOut().print(getRequestContext().getLocale());
+ }else {
+ // Resolve the unescaped message.
+ String msg = resolveMessage();
- public final int doEndTag() throws JspException{
- int tagReturn=EVAL_PAGE;
- try{
- if(null==code){
- pageContext.getOut().print(WebContext.getRequestLocale());
- }else{
- String localeText=WebContext.getI18nValue(code);
- if(localeText==null||localeText.equals("")){
- String []localPath=code.split("\\.");
- localeText=localPath[(localPath.length>1?localPath.length-1:0)];
- localeText=localeText.toUpperCase().charAt(0)+localeText.substring(1);
+ // HTML and/or JavaScript escape, if demanded.
+ msg = htmlEscape(msg);
+ msg = this.javaScriptEscape ? JavaScriptUtils.javaScriptEscape(msg) : msg;
+
+ // Expose as variable, if demanded, else write to the page.
+ if (this.var != null) {
+ this.pageContext.setAttribute(this.var, msg, TagUtils.getScope(this.scope));
+ }
+ else {
+ writeMessage(msg);
}
- pageContext.getOut().print(localeText);
}
-
- pageContext.getOut().flush();
- } catch (IOException e){
- throw new JspException("exception="+e.getMessage());
+ return EVAL_PAGE;
}
- return tagReturn;
-
+ catch (IOException ex) {
+ System.out.println("IOException code "+code);
+ throw new JspTagException(ex.getMessage(), ex);
+ }
+ catch (NoSuchMessageException ex) {
+ System.out.println("IOException code "+code);
+ throw new JspTagException(getNoSuchMessageExceptionDescription(ex));
+ }
+ }
+
+ @Override
+ public void release() {
+ super.release();
+ this.arguments = null;
+ }
+
+
+ /**
+ * Resolve the specified message into a concrete message String.
+ * The returned message String should be unescaped.
+ */
+ protected String resolveMessage() throws JspException, NoSuchMessageException {
+ MessageSource messageSource = getMessageSource();
+
+ // Evaluate the specified MessageSourceResolvable, if any.
+ if (this.message != null) {
+ // We have a given MessageSourceResolvable.
+ return messageSource.getMessage(this.message, getRequestContext().getLocale());
+ }
+
+ if (this.code != null || this.text != null) {
+ // We have a code or default text that we need to resolve.
+ Object[] argumentsArray = resolveArguments(this.arguments);
+ if (!this.nestedArguments.isEmpty()) {
+ argumentsArray = appendArguments(argumentsArray, this.nestedArguments.toArray());
+ }
+
+ if (this.text != null) {
+ // We have a fallback text to consider.
+ String msg = messageSource.getMessage(
+ this.code, argumentsArray, this.text, getRequestContext().getLocale());
+ return (msg != null ? msg : "");
+ }
+ else {
+ // We have no fallback text to consider.
+ return messageSource.getMessage(
+ this.code, argumentsArray, getRequestContext().getLocale());
+ }
+ }
+
+ System.out.println("No resolvable message for code "+code);
+ return argumentSeparator;
+ }
+
+ private Object[] appendArguments(@Nullable Object[] sourceArguments, Object[] additionalArguments) {
+ if (ObjectUtils.isEmpty(sourceArguments)) {
+ return additionalArguments;
+ }
+ Object[] arguments = new Object[sourceArguments.length + additionalArguments.length];
+ System.arraycopy(sourceArguments, 0, arguments, 0, sourceArguments.length);
+ System.arraycopy(additionalArguments, 0, arguments, sourceArguments.length, additionalArguments.length);
+ return arguments;
+ }
+
+ /**
+ * Resolve the given arguments Object into an arguments array.
+ * @param arguments the specified arguments Object
+ * @return the resolved arguments as array
+ * @throws JspException if argument conversion failed
+ * @see #setArguments
+ */
+ @Nullable
+ protected Object[] resolveArguments(@Nullable Object arguments) throws JspException {
+ if (arguments instanceof String) {
+ String[] stringArray =
+ StringUtils.delimitedListToStringArray((String) arguments, this.argumentSeparator);
+ if (stringArray.length == 1) {
+ Object argument = stringArray[0];
+ if (argument != null && argument.getClass().isArray()) {
+ return ObjectUtils.toObjectArray(argument);
+ }
+ else {
+ return new Object[] {argument};
+ }
+ }
+ else {
+ return stringArray;
+ }
+ }
+ else if (arguments instanceof Object[]) {
+ return (Object[]) arguments;
+ }
+ else if (arguments instanceof Collection) {
+ return ((Collection) arguments).toArray();
+ }
+ else if (arguments != null) {
+ // Assume a single argument object.
+ return new Object[] {arguments};
+ }
+ else {
+ return null;
+ }
+ }
+
+ /**
+ * Write the message to the page.
+ *
Can be overridden in subclasses, e.g. for testing purposes.
+ * @param msg the message to write
+ * @throws IOException if writing failed
+ */
+ protected void writeMessage(String msg) throws IOException {
+ this.pageContext.getOut().write(String.valueOf(msg));
+ }
+
+ /**
+ * Use the current RequestContext's application context as MessageSource.
+ */
+ protected MessageSource getMessageSource() {
+ return getRequestContext().getMessageSource();
+ }
+
+ /**
+ * Return default exception message.
+ */
+ protected String getNoSuchMessageExceptionDescription(NoSuchMessageException ex) {
+ return ex.getMessage();
}
}
diff --git a/maxkey-core/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java b/maxkey-core/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java
new file mode 100644
index 000000000..fb6703161
--- /dev/null
+++ b/maxkey-core/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java
@@ -0,0 +1,21 @@
+package org.maxkey.crypto.password;
+
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+
+public class PasswordReciprocalTest {
+
+ public PasswordReciprocalTest() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public static void main(String[] args) {
+ // TODO Auto-generated method stub
+ BCryptPasswordEncoder spe= new BCryptPasswordEncoder();
+ String pass=PasswordReciprocal.getInstance().rawPassword("admin", "admin");
+ String epass=spe.encode(pass);
+ System.out.println("PasswordEncoder "+epass);
+
+ System.out.println(PasswordReciprocal.getInstance().decoder("bb2002b9f55b05d3e0e6f34ec5321051"));
+ }
+
+}
diff --git a/maxkey-dao/.classpath b/maxkey-dao/.classpath
index 32b3a1cf3..467ef2f2b 100644
--- a/maxkey-dao/.classpath
+++ b/maxkey-dao/.classpath
@@ -1,8 +1,18 @@
-
+
+
+
+
+
+
+
diff --git a/maxkey-dao/.project b/maxkey-dao/.project
index d0fdce620..694bc5003 100644
--- a/maxkey-dao/.project
+++ b/maxkey-dao/.project
@@ -1,7 +1,7 @@
maxkey-dao
- Project maxkey-dao created by Buildship.
+ maxkey-dao
@@ -20,11 +20,6 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
org.eclipse.wst.validation.validationbuilder
@@ -32,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-dao/.settings/org.eclipse.jdt.core.prefs b/maxkey-dao/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-dao/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-dao/build.gradle b/maxkey-dao/build.gradle
index 76bf2dd69..50eb89f2f 100644
--- a/maxkey-dao/build.gradle
+++ b/maxkey-dao/build.gradle
@@ -2,18 +2,7 @@ description = "maxkey-dao"
dependencies {
//local jars
- compile fileTree(dir: '../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/spring-security/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/tiles/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
compile project(":maxkey-core")
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AccountsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AccountsMapper.xml
index 939d649e2..e3715529b 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AccountsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AccountsMapper.xml
@@ -1,6 +1,6 @@
-
+
@@ -17,29 +17,9 @@
-
- INSERT INTO APP_ACCOUNTS(
- ID,
- UID,
- USERNAME,
- DISPLAYNAME,
- APPID,
- APPNAME,
- RELATEDUSERNAME,
- RELATEDPASSWORD
- )VALUES(
- #{id},
- #{uid},
- #{username},
- #{displayName},
- #{appId},
- #{appName},
- #{relatedUsername},
- #{relatedPassword}
- )
-
-
+
+
SELECT
*
FROM
@@ -49,7 +29,7 @@
-
+
SELECT
COUNT(*)
FROM
@@ -58,37 +38,5 @@
(1=1)
-
-
- UPDATE APP_ACCOUNTS SET
- RELATEDUSERNAME = #{relatedUsername},
- RELATEDPASSWORD = #{relatedPassword},
- MODIFIEDDATE = current_timestamp()
- WHERE
- UID = #{uid}
- AND APPID = #{appId}
-
-
-
- SELECT
- *
- FROM
- APP_ACCOUNTS
- WHERE
- UID = #{uid}
- AND APPID = #{appId}
-
-
-
- SELECT
- *
- FROM
- APP_ACCOUNTS
- WHERE
- ID = #{id}
-
-
-
- DELETE FROM APP_ACCOUNTS WHERE ID=#{value}
-
+
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppCategorysMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppCategorysMapper.xml
deleted file mode 100644
index 82c444e61..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppCategorysMapper.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
-
-
- AND ID = #{id}
-
-
- AND NAME LIKE '%${name}%'
-
-
-
-
- INSERT INTO APP_CATEGORY(
- ID,
- NAME,
- SORTORDER,
- DESCRIPTION,
-
- CREATEDBY,
- CREATEDDATE,
- MODIFIEDBY,
- MODIFIEDDATE,
-
- STATUS
- )VALUES(
- #{id},
- #{name},
- #{sortOrder},
- #{description},
-
- #{createdBy},
- #{createdDate} ,
- #{modifiedBy},
- #{modifiedDate},
-
- #{status}
- )
-
-
-
- SELECT
- *
- FROM
- APP_CATEGORY
- WHERE
- (1=1)
-
-
-
- SELECT
- *
- FROM
- APP_CATEGORY
- WHERE
- (1=1)
-
-
-
- SELECT
- COUNT(*)
- FROM
- APP_CATEGORY
- WHERE
- (1=1)
-
-
-
- SELECT
- *
- FROM APP_CATEGORY
- WHERE
- ID = #{value}
-
-
-
-
-
- SELECT
- *
- FROM
- APP_CATEGORY
- WHERE
- (1=1)
-
-
-
- UPDATE APP_CATEGORY SET
- NAME = #{name},
- SORTORDER = #{sortOrder},
- DESCRIPTION = #{description},
- STATUS = #{status},
- MODIFIEDBY = #{modifiedBy},
- MODIFIEDDATE = #{modifiedDate}
- WHERE ID = #{id}
-
-
-
-
- UPDATE APP_CATEGORY SET
- STATUS = '2'
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
- ADN NAME = #{name}
-
-
-
-
- DELETE FROM APP_CATEGORY WHERE ID=#{id}
-
-
-
- UPDATE APP_CATEGORY SET STATUS='2' WHERE ID IN
-
- #{item}
-
-
-
-
- DELETE FROM APP_CATEGORY WHERE ID IN
-
- #{item}
-
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ApplicationsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ApplicationsMapper.xml
index 997a4dc65..19b25154e 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ApplicationsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ApplicationsMapper.xml
@@ -1,6 +1,6 @@
-
+
@@ -23,143 +23,6 @@
-
- INSERT INTO APPLICATIONS(
- ID,
- NAME,
- ICON,
- LOGINURL,
- PROTOCOL,
- CATEGORY,
- SECRET,
- DESCRIPTION,
- VENDOR,
- VENDORURL,
-
- CREDENTIAL,
- SHAREDUSERNAME,
- SHAREDPASSWORD,
- SYSTEMUSERATTR,
-
- ISEXTENDATTR,
- EXTENDATTR,
-
- ISSIGNATURE,
-
- ISADAPTER,
- ADAPTER,
-
- PRINCIPAL,
- CREDENTIALS,
-
- VISIBLE,
-
- SORTORDER,
-
- CREATEDBY,
- CREATEDDATE,
-
- STATUS
- )VALUES(
- #{id},
- #{name},
- #{icon},
- #{loginUrl},
- #{protocol},
- #{category},
- #{secret},
- #{description},
- #{vendor} ,
- #{vendorUrl},
-
- #{credential},
- #{sharedUsername},
- #{sharedPassword},
- #{systemUserAttr},
-
- #{isExtendAttr},
- #{extendAttr},
-
- #{isSignature},
-
- #{isAdapter},
- #{adapter},
-
- #{principal},
- #{credentials},
-
- #{visible},
-
- #{sortOrder},
-
- #{createdBy},
- #{createdDate} ,
-
- #{status}
- )
-
-
-
- UPDATE APPLICATIONS SET
- NAME = #{name},
-
- ICON = #{icon},
-
- LOGINURL = #{loginUrl},
- PROTOCOL = #{protocol},
- CATEGORY = #{category},
- SECRET = #{secret},
- DESCRIPTION = #{description},
- VENDOR = #{vendor},
- VENDORURL = #{vendorUrl},
-
- CREDENTIAL = #{credential},
- SHAREDUSERNAME = #{sharedUsername},
- SHAREDPASSWORD = #{sharedPassword},
- SYSTEMUSERATTR = #{systemUserAttr},
-
- ISEXTENDATTR = #{isExtendAttr},
- EXTENDATTR = #{extendAttr},
-
- ISSIGNATURE = #{isSignature},
-
-
- ISADAPTER = #{isAdapter},
- ADAPTER = #{adapter},
-
- PRINCIPAL = #{principal},
- CREDENTIALS = #{credentials},
- VISIBLE = #{visible},
- SORTORDER = #{sortOrder},
-
- MODIFIEDBY = #{modifiedBy},
- MODIFIEDDATE = #{modifiedDate},
-
- STATUS = #{status}
- WHERE
- ID = #{id}
-
-
-
- SELECT
- *
- FROM
- APPLICATIONS
- WHERE
- (1=1)
-
-
-
- SELECT
- *
- FROM
- APPLICATIONS
- WHERE
- ID = #{value}
-
SELECT
@@ -183,18 +46,5 @@
-
- SELECT
- *
- FROM
- APPLICATIONS
- WHERE
- (1=1)
-
-
-
- DELETE FROM APPLICATIONS WHERE ID=#{value}
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/CasDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/CasDetailsMapper.xml
index dfbb51931..7d5f69f43 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/CasDetailsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/CasDetailsMapper.xml
@@ -1,61 +1,5 @@
-
+
-
- INSERT INTO CAS_DETAILS(
- ID,
- SERVICE,
- VALIDATION
- )VALUES(
- #{id},
- #{service},
- #{validation}
- )
-
-
-
- UPDATE CAS_DETAILS SET
- SERVICE = #{service},
- VALIDATION = #{validation}
-
- WHERE
- ID = #{id}
-
-
-
- SELECT
- *
- FROM
- CAS_DETAILS CD,
- APPLICATIONS APP
- WHERE
- APP.ID = #{value}
- AND CD.ID = #{value}
- AND CD.ID = APP.ID
- AND STATUS = 1
-
-
-
- SELECT
- *
- FROM
- CAS_DETAILS CD,
- APPLICATIONS APP
- WHERE
- 1 = 1
-
- AND APP.ID = #{value}
- AND CD.ID = #{value}
-
-
- AND CD.SERVICE = #{service}
-
- AND CD.ID = APP.ID
- AND STATUS = 1
-
-
-
- DELETE FROM CAS_DETAILS WHERE ID=#{value}
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/CompanysMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/CompanysMapper.xml
deleted file mode 100644
index 79e9b344e..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/CompanysMapper.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
- INSERT INTO COMPANYS(
- ID,
- SHORTNAME,
- FULLNAME,
- DIVISION ,
-
- REPRESENTATIVE,
- CATEGORY,
- WEBSITE,
- PHONE ,
- EMAIL ,
- FAX,
- POSTALCODE,
- LICENSE,
- CREATIONDATE,
-
-
- COUNTRY ,
- REGION ,
- LOCALITY ,
- STREET ,
-
- DESCRIPTION,
-
- CREATEDBY,
- CREATEDDATE,
-
- STATUS
- )VALUES(
- #{id},
- #{shortName},
- #{fullName},
- #{division} ,
- #{representative},
- #{category} ,
- #{webSite} ,
- #{phone},
- #{email},
- #{fax},
- #{postalCode},
- #{license},
- #{creationDate},
-
- #{country} ,
- #{region} ,
- #{locality} ,
- #{street},
-
- #{description},
-
- #{createdBy},
- #{createdDate} ,
-
- #{status}
- )
-
-
-
- UPDATE COMPANYS SET
- SHORTNAME = #{shortName},
- FULLNAME = #{fullName},
- DIVISION = #{division},
-
- REPRESENTATIVE = #{representative},
- CATEGORY = #{category},
- WEBSITE = #{webSite},
- PHONE = #{phone},
- EMAIL = #{email},
- FAX = #{fax},
- POSTALCODE = #{postalCode},
- LICENSE = #{license},
- CREATIONDATE = #{creationDate},
-
-
- COUNTRY = #{country},
- REGION = #{region},
- LOCALITY = #{locality},
- STREET = #{street},
-
- DESCRIPTION = #{description},
-
- MODIFIEDBY = #{modifiedBy},
- MODIFIEDDATE = current_timestamp,
-
- STATUS = #{status}
-
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
-
-
- SELECT
- *
- FROM
- COMPANYS
- WHERE
- (1=1)
-
- AND SHORTNAME = #{shortName}
-
-
-
-
- SELECT
- *
- FROM
- COMPANYS
- WHERE
- (1=1)
-
- AND SHORTNAME = #{shortName}
-
-
-
-
- SELECT
- COUNT(*)
- FROM
- COMPANYS
- WHERE
- (1=1)
-
- AND SHORTNAME = #{shortName}
-
-
-
-
-
-
- SELECT
- *
- FROM
- COMPANYS
- WHERE
- (1=1)
-
- AND SHORTNAME = #{shortName}
-
-
- AND ID = #{id}
-
-
-
-
- SELECT
- *
- FROM
- COMPANYS
- WHERE
- ID = #{value}
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/DesktopDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/DesktopDetailsMapper.xml
index 97fba2660..611cff445 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/DesktopDetailsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/DesktopDetailsMapper.xml
@@ -2,76 +2,5 @@
-
- INSERT INTO DESKTOP_DETAILS(
- ID,
- PROGRAMPATH,
- PARAMETER,
-
- USERNAMETYPE,
- PREUSERNAME,
- USERNAMEPARAMETER,
-
- PASSWORDTYPE,
- PREPASSWORD,
- PASSWORDPARAMETER,
-
- SUBMITTYPE,
- SUBMITKEY,
- PRESUBMIT
- )VALUES(
- #{id},
- #{programPath},
- #{parameter},
-
- #{usernameType},
- #{preUsername},
- #{usernameParameter},
-
- #{passwordType} ,
- #{prePassword} ,
- #{passwordParameter},
-
- #{submitType},
- #{submitKey},
- #{preSubmit}
- )
-
-
- UPDATE DESKTOP_DETAILS SET
- PROGRAMPATH = #{programPath},
- PARAMETER = #{parameter},
-
- USERNAMETYPE = #{usernameType},
- PREUSERNAME = #{preUsername},
- USERNAMEPARAMETER = #{usernameParameter},
-
- PASSWORDTYPE = #{passwordType},
- PREPASSWORD = #{prePassword},
- PASSWORDPARAMETER = #{passwordParameter},
-
- SUBMITTYPE = #{submitType},
- SUBMITKEY = #{submitKey},
- PRESUBMIT = #{preSubmit}
- WHERE
- ID = #{id}
-
-
-
- SELECT
- *
- FROM
- DESKTOP_DETAILS DD,
- APPLICATIONS APP
- WHERE
- APP.ID = #{value}
- AND DD.ID = #{value}
- AND DD.ID = APP.ID
- AND STATUS = 1
-
-
-
- DELETE FROM DESKTOP_DETAILS WHERE ID=#{value}
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ForgotPasswordMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ForgotPasswordMapper.xml
index 85077c703..9f7305ec2 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ForgotPasswordMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ForgotPasswordMapper.xml
@@ -11,40 +11,6 @@
EMAIL = #{value}
-
- INSERT INTO FORGOT_PASSWORD(
- ID,
- UID,
- USERNAME,
- EMAIL,
-
- CREATEDDATE,
- STATUS
- )VALUES(
- #{id},
- #{uid},
- #{username},
- #{email},
-
- current_timestamp(),
- 1
- )
-
-
-
- DELETE FROM
- FORGOT_PASSWORD
- WHERE
- ID = #{id}
-
-
- SELECT
- *
- FROM FORGOT_PASSWORD
- WHERE
- ID = #{value}
- AND STATUS = 1
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/FormBasedDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/FormBasedDetailsMapper.xml
index b6c5509a4..53c2383cd 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/FormBasedDetailsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/FormBasedDetailsMapper.xml
@@ -2,61 +2,5 @@
-
- INSERT INTO FORM_BASED_DETAILS(
- ID,
- REDIRECTURI,
- USERNAMEMAPPING,
- PASSWORDMAPPING,
- AUTHORIZEVIEW
-
- )VALUES(
- #{id},
- #{redirectUri},
- #{usernameMapping},
- #{passwordMapping},
- #{authorizeView}
- )
-
-
- UPDATE FORM_BASED_DETAILS SET
- REDIRECTURI = #{redirectUri},
- USERNAMEMAPPING = #{usernameMapping},
- PASSWORDMAPPING = #{passwordMapping},
- AUTHORIZEVIEW = #{authorizeView}
-
- WHERE
- ID = #{id}
-
-
-
- SELECT
- *
- FROM
- FORM_BASED_DETAILS FBD,
- APPLICATIONS APP
- WHERE
- APP.ID = #{value}
- AND FBD.ID = #{value}
- AND FBD.ID = APP.ID
- AND STATUS = 1
-
-
-
- SELECT
- *
- FROM
- FORM_BASED_DETAILS FBD,
- SAAS_APP_TEMPLET APP
- WHERE
- APP.ID = #{value}
- AND FBD.ID = #{value}
- AND FBD.ID = APP.ID
- AND STATUS = 1
-
-
-
- DELETE FROM FORM_BASED_DETAILS WHERE ID=#{value}
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupAppMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupAppMapper.xml
deleted file mode 100644
index c3d0b0a39..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupAppMapper.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
- AND ID = #{id}
-
-
- AND NAME LIKE '%${name}%'
-
-
- AND PROTOCOL = #{protocol}
-
-
- AND CATEGORY = #{category}
-
-
-
-
-
- SELECT
- *
- FROM
- APPLICATIONS
- WHERE
- 1 = 1
- AND ID IN(
- SELECT
- APPID
- FROM
- GROUP_APP
- WHERE
- GROUPID = #{groupId}
-
- )
-
-
-
- SELECT
- COUNT(*)
- FROM
- APPLICATIONS
- WHERE
- 1 = 1
- AND ID IN(
- SELECT
- APPID
- FROM
- GROUP_APP
- WHERE
- GROUPID = #{groupId}
-
- )
-
-
-
- SELECT
- *
- FROM
- APPLICATIONS
- WHERE
- 1 = 1
- AND ID NOT IN(
- SELECT
- APPID
- FROM
- GROUP_APP
- WHERE
- GROUPID = #{groupId}
-
- )
-
-
-
- SELECT
- COUNT(*)
- FROM
- APPLICATIONS
- WHERE
- 1 = 1
- AND ID NOT IN(
- SELECT
- APPID
- FROM
- GROUP_APP
- WHERE
- GROUPID = #{groupId}
-
- )
-
-
-
- INSERT INTO
- GROUP_APP
- (
- ID,
- GROUPID,
- APPID
- )
- VALUES
- (
- #{id},
- #{groupId},
- #{appId}
- )
-
-
-
- DELETE FROM GROUP_APP WHERE GROUPID = #{groupId} AND APPID = #{appId}
-
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupMemberMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupMemberMapper.xml
index 77e8bb277..e939c3cf5 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupMemberMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupMemberMapper.xml
@@ -265,25 +265,5 @@
-
- INSERT INTO
- GROUP_MEMBER
- (
- ID,
- GROUPID,
- MEMBERID,
- TYPE
- )
- VALUES
- (
- #{id},
- #{groupId},
- #{memberId},
- #{type}
- )
-
-
-
- DELETE FROM GROUP_MEMBER WHERE GROUPID = #{groupId} AND MEMBERID = #{memberId}
-
+
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml
deleted file mode 100644
index 6884aaf5e..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
- AND GROUPID like '#${groupId}#'
-
-
- AND RESOURCEID like '#${resourceId}#'
-
-
- AND STATUS = #{status}
-
-
-
-
- DELETE FROM PRIVILEGES WHERE GROUPID = #{value}
-
-
-
- INSERT INTO
- PRIVILEGES
- (
- ID,
- GROUPID,
- RESOURCEID
- )
- VALUES
-
- (
- #{item.id},
- #{item.groupId},
- #{item.resourceId}
- )
-
-
-
-
-
- SELECT DISTINCT R.* FROM PRIVILEGES P,RESOURCES R
- WHERE P.RESOURCEID = R.ID
- AND R.STATUS = 1
- AND P.GROUPID = #{value}
- ORDER BY PID, SORTORDER
-
-
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupsMapper.xml
index 000c18785..bbdccfba1 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupsMapper.xml
@@ -11,55 +11,7 @@
-
- INSERT INTO GROUPS(
- ID,
- NAME,
- ISDEFAULT,
-
- CREATEDBY,
- CREATEDDATE,
- MODIFIEDBY,
- MODIFIEDDATE,
-
- STATUS
- )VALUES(
- #{id},
- #{name},
- #{isdefault},
-
- #{createdBy},
- #{createdDate} ,
- #{modifiedBy},
- #{modifiedDate},
-
- #{status}
- )
-
-
- UPDATE GROUPS SET
- NAME = #{name},
- ISDEFAULT = #{isdefault}
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
- ADN NAME = #{name}
-
-
-
-
- SELECT
- *
- FROM
- GROUPS
- WHERE
- (1=1)
-
SELECT
@@ -81,23 +33,7 @@
-
- SELECT
- *
- FROM GROUPS
- WHERE
- ID = #{value}
-
-
-
- SELECT
- *
- FROM
- GROUPS
- WHERE
- (1=1)
-
+
UPDATE GROUPS SET
@@ -111,9 +47,6 @@
-
- DELETE FROM GROUPS WHERE ID=#{id}
-
UPDATE GROUPS SET STATUS='2' WHERE ID IN
@@ -122,10 +55,5 @@
-
- DELETE FROM GROUPS WHERE ID IN
-
- #{item}
-
-
+
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/IpAddrFilterMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/IpAddrFilterMapper.xml
index f98291d29..521b9826e 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/IpAddrFilterMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/IpAddrFilterMapper.xml
@@ -13,50 +13,7 @@
-
- INSERT INTO IPADDRFILTER(
- ID,
- IPADDR,
- FILTER,
- CREATEDBY,
- CREATEDDATE,
-
- STATUS
- )VALUES(
- #{id},
- #{ipAddr},
- #{filter},
-
- #{createdBy},
- #{createdDate} ,
-
- #{status}
- )
-
-
- UPDATE IPADDRFILTER SET
- IPADDR = #{ipAddr},
- FILTER = #{filter},
-
- MODIFIEDBY = #{modifiedBy},
- MODIFIEDDATE = #{modifiedDate},
-
- STATUS = #{status}
- WHERE
- ID = #{id}
-
-
-
- SELECT
- *
- FROM
- IPADDRFILTER
- WHERE
- (1=1)
-
SELECT
@@ -78,24 +35,5 @@
-
- SELECT
- *
- FROM
- IPADDRFILTER
- WHERE
- ID = #{value}
- AND STATUS = 1
-
-
-
- DELETE FROM IPADDRFILTER WHERE ID=#{id}
-
-
-
- DELETE FROM IPADDRFILTER WHERE ID IN
-
- #{item}
-
-
+
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginAppsHistoryMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginAppsHistoryMapper.xml
index 0c9dc6fc3..5f21392f0 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginAppsHistoryMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginAppsHistoryMapper.xml
@@ -59,27 +59,5 @@
- INSERT INTO
- LOGIN_APPS_HISTORY
- (
- ID,
- SESSIONID,
- APPID,
- APPNAME,
- UID,
- USERNAME,
- DISPLAYNAME
- )
- VALUES
- (
- #{id},
- #{sessionId},
- #{appId},
- #{appName},
- #{uid},
- #{username},
- #{displayName}
- )
-
+
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginHistoryMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginHistoryMapper.xml
index c33d7313c..bc2cc67a5 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginHistoryMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LoginHistoryMapper.xml
@@ -36,27 +36,7 @@
-
- SELECT
- ID,
- SESSIONID,
- UID,
- USERNAME,
- DISPLAYNAME,
- LOGINTYPE,
- MESSAGE,
- CODE,
- PROVIDER,
- SOURCEIP,
- BROWSER,
- PLATFORM,
- APPLICATION,
- LOGINURL,
- DATE_FORMAT(LOGINTIME, '%Y-%m-%d %H:%i:%s') AS LOGINTIME
- FROM LOGIN_HISTORY
- WHERE 1 = 1
-
+
SELECT
@@ -83,43 +63,7 @@
ORDER BY LOGINTIME DESC
-
- INSERT INTO
- LOGIN_HISTORY
- (
- ID,
- SESSIONID,
- UID,
- USERNAME,
- DISPLAYNAME,
- LOGINTYPE,
- MESSAGE,
- CODE,
- PROVIDER,
- SOURCEIP,
- BROWSER,
- PLATFORM,
- APPLICATION,
- LOGINURL
- )
- VALUES
- (
- #{id},
- #{sessionId},
- #{uid},
- #{username},
- #{displayName},
- #{loginType},
- #{message},
- #{code},
- #{provider},
- #{sourceIp},
- #{browser},
- #{platform},
- #{application},
- #{loginUrl}
- )
-
+
SELECT COUNT(*) FROM LOGIN_HISTORY
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LogsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LogsMapper.xml
index f26e661d6..e297bedd2 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LogsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/LogsMapper.xml
@@ -30,26 +30,7 @@
-
- SELECT
- ID,
- TID,
- TNAME,
- SERVICENAME ,
- CODE,
- MESSAGE ,
- CONTENT,
- OPERATETYPE,
- MESSAGETYPE,
- USERNAME,
- CREATEDDATE,
- CREATEDBY
- FROM LOGS
- WHERE 1 = 1
-
+
SELECT
@@ -72,38 +53,7 @@
ORDER BY CREATEDDATE DESC
-
- INSERT INTO
- LOGS
- (
- ID,
- TID,
- TNAME,
- SERVICENAME ,
- CODE,
- MESSAGE ,
- CONTENT,
- OPERATETYPE,
- MESSAGETYPE,
- USERNAME,
- CREATEDBY
- )
- VALUES
- (
- #{id},
- #{tid},
- #{tname},
- #{serviceName},
- #{code },
- #{message },
- #{content},
- #{operateType},
- #{messageType},
- #{username},
- #{createdBy}
- )
-
-
+
SELECT COUNT(*) FROM LOGS
WHERE 1 = 1
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyAppsListMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyAppsListMapper.xml
index c54e60604..dc2b5d560 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyAppsListMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyAppsListMapper.xml
@@ -1,6 +1,6 @@
-
+
SELECT DISTINCT
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/NavigationsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/NavigationsMapper.xml
index 23e6583b6..3b599294d 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/NavigationsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/NavigationsMapper.xml
@@ -17,26 +17,7 @@
-
- SELECT
- ID,
- NAME ,
- URL ,
- TARGET,
- TYPE,
- PID,
- PNAME,
- SORTORDER,
- VISIBLE,
- XPATH,
- STATUS,
- HASCHILD,
- DESCRIPTION
- FROM NAVIGATIONS
- WHERE 1 = 1
-
+
SELECT
@@ -58,41 +39,7 @@
-
- INSERT INTO
- NAVIGATIONS
- (
- ID,
- NAME ,
- URL ,
- TARGET,
- TYPE,
- PID,
- PNAME,
- SORTORDER,
- VISIBLE,
- XPATH,
- STATUS,
- HASCHILD,
- DESCRIPTION
- )
- VALUES
- (
- #{id},
- #{name},
- #{url},
- #{target},
- #{type},
- #{pId},
- #{pName},
- #{sortOrder},
- #{visible},
- #{xPath},
- #{status},
- #{hasChild},
- #{description}
- )
-
+
SELECT COUNT(*) FROM NAVIGATIONS
@@ -100,25 +47,7 @@
-
- UPDATE NAVIGATIONS SET
- NAME = #{name},
- URL = #{url},
- TARGET = #{target},
- TYPE = #{type},
- PID = #{pId},
- PNAME = #{pName},
- SORTORDER = #{sortOrder},
- VISIBLE = #{visible},
- XPATH = #{xPath},
- STATUS = #{status},
- HASCHILD = #{hasChild},
- DESCRIPTION = #{description}
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
+
UPDATE NAVIGATIONS SET STATUS = '2'
@@ -145,21 +74,7 @@
-
- DELETE FROM NAVIGATIONS WHERE 1 = 1 AND
- (
- ID = #{id}
- OR PID = #{id}
- OR XPATH LIKE '%${id}%'
- )
-
+
-
- DELETE FROM NAVIGATIONS WHERE ID IN
-
- #{selectId}
-
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Oauth10aDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Oauth10aDetailsMapper.xml
index 8d30bdd44..06a008d20 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Oauth10aDetailsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Oauth10aDetailsMapper.xml
@@ -2,59 +2,4 @@
-
- INSERT INTO OAUTH10A_CLIENT_DETAILS(
- CLIENT_ID,
- CLIENT_SECRET,
- SCOPE,
- AUTHORIZED_GRANT_TYPES,
- WEB_SERVER_REDIRECT_URI,
- AUTHORITIES,
- APPROVALPROMPT
- )VALUES(
- #{clientId},
- #{clientSecret},
- #{scope},
- #{authorizedGrantTypes},
- #{registeredRedirectUris},
- #{authorities},
- #{approvalPrompt}
- )
-
-
-
- UPDATE OAUTH10A_CLIENT_DETAILS SET
- CLIENT_SECRET = #{clientSecret},
- SCOPE = #{scope},
- AUTHORIZED_GRANT_TYPES = #{authorizedGrantTypes},
- WEB_SERVER_REDIRECT_URI = #{registeredRedirectUris},
- AUTHORITIES = #{authorities},
- APPROVALPROMPT = #{approvalPrompt}
- WHERE
- CLIENT_ID = #{clientId}
-
-
-
- SELECT
- OCD.CLIENT_ID AS CLIENTID,
- OCD.CLIENT_SECRET AS CLIENTSECRET,
- OCD.SCOPE,
- OCD.AUTHORIZED_GRANT_TYPES AS AUTHORIZEDGRANTTYPES,
- OCD.WEB_SERVER_REDIRECT_URI AS REGISTEREDREDIRECTURIS,
- OCD.AUTHORITIES,
- OCD.APPROVALPROMPT,
- APP.*
- FROM
- OAUTH10A_CLIENT_DETAILS OCD,
- APPLICATIONS APP
- WHERE
- APP.ID = #{value}
- AND OCD.CLIENT_ID = #{value}
- AND OCD.CLIENT_ID = APP.ID
- AND APP.STATUS = 1
-
-
-
- DELETE FROM OAUTH10A_CLIENT_DETAILS WHERE CLIENT_ID=#{value}
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/OrganizationsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/OrganizationsMapper.xml
index ea9e50429..d2a6bc413 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/OrganizationsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/OrganizationsMapper.xml
@@ -18,14 +18,7 @@
-
- SELECT
- *
- FROM ORGANIZATIONS
- WHERE 1 = 1
-
+
SELECT
@@ -35,117 +28,14 @@
-
- INSERT INTO
- ORGANIZATIONS
- (
- ID ,
- CODE,
- NAME ,
- FULLNAME,
- PID ,
- PNAME ,
- TYPE ,
- XPATH ,
- XNAMEPATH ,
- LEVEL ,
- SORTORDER ,
- HASCHILD,
-
- DIVISION ,
- COUNTRY ,
- REGION,
- LOCALITY ,
- STREET,
- ADDRESS,
- CONTACT,
- POSTALCODE,
- PHONE,
- FAX ,
- EMAIL,
-
- DESCRIPTION ,
- STATUS ,
- CREATEDBY,
- CREATEDDATE
- )
- VALUES
- (
- #{id},
- #{code},
- #{name},
- #{fullName},
- #{pId},
- #{pName},
- #{type},
- #{xPath},
- #{xNamePath},
- #{level},
- #{sortOrder},
- #{hasChild},
-
- #{division},
- #{country},
- #{region},
- #{locality},
- #{street},
- #{address},
- #{contact},
- #{postalCode},
- #{phone},
- #{fax},
- #{email},
-
- #{description},
- #{status},
- #{createdBy},
- current_timestamp
- )
-
-
+
SELECT COUNT(*) FROM ORGANIZATIONS
WHERE 1 = 1
-
- UPDATE ORGANIZATIONS SET
- CODE = #{code},
- NAME = #{name},
- FULLNAME = #{fullName},
- PID = #{pId},
- PNAME = #{pName},
- TYPE = #{type},
- XPATH = #{xPath},
- XNAMEPATH = #{xNamePath},
- LEVEL = #{level},
- SORTORDER = #{sortOrder},
- HASCHILD = #{hasChild},
-
- DIVISION = #{division},
- COUNTRY = #{country},
- REGION = #{region},
- LOCALITY = #{locality},
- STREET = #{street},
- ADDRESS = #{address},
- CONTACT = #{contact},
- POSTALCODE = #{postalCode},
- PHONE = #{phone},
- FAX = #{fax},
- EMAIL = #{email},
-
- DESCRIPTION = #{description},
- STATUS = #{status},
- MODIFIEDBY = #{modifiedBy},
- MODIFIEDDATE = current_timestamp
-
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
-
+
UPDATE ORGANIZATIONS SET STATUS = '2'
WHERE 1 = 1
@@ -171,14 +61,5 @@
-
- DELETE FROM ORGANIZATIONS WHERE 1 = 1 AND
- (
- ID = #{id}
- OR PID = #{id}
- OR XPATH LIKE '%${id}%'
- )
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/PasswordPolicyMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/PasswordPolicyMapper.xml
index 2ce7fdec9..f7749133b 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/PasswordPolicyMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/PasswordPolicyMapper.xml
@@ -2,39 +2,5 @@
-
- SELECT
- ID,
- MINLENGTH,
- MAXLENGTH,
- LOWERCASE,
- UPPERCASE,
- DIGITS,
- SPECIALCHAR,
- ATTEMPTS,
- DURATION,
- EXPIRATION,
- USERNAME,
- SIMPLEPASSWORDS
- FROM PASSWORD_POLICY
-
-
-
- UPDATE PASSWORD_POLICY
- SET
- MINLENGTH = #{minLength},
- MAXLENGTH = #{maxLength},
- LOWERCASE = #{lowerCase},
- UPPERCASE = #{upperCase},
- DIGITS = #{digits},
- SPECIALCHAR = #{specialChar},
- ATTEMPTS = #{attempts},
- DURATION = #{duration},
- EXPIRATION = #{expiration},
- USERNAME = #{username},
- SIMPLEPASSWORDS = #{simplePasswords}
- WHERE
- ID = #{id}
-
-
+
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ProvisioningEntryMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ProvisioningEntryMapper.xml
deleted file mode 100644
index 91f23a135..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ProvisioningEntryMapper.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
- AND PROVISIONINGID = #{provisioningId}
-
-
- AND PROVISIONINGNAME = #{provisioningName}
-
-
- AND ENTRYID = #{entryId}
-
-
- AND ENTRYNAME = #{entryName}
-
-
- AND ENTRYTYPE like '%${entryType}%'
-
-
-
-
-
-
- SELECT
- *
- FROM PROVISIONING_ENTRY
-
-
-
- SELECT COUNT(1) FROM PROVISIONING_ENTRY
-
-
-
- SELECT
- *
- FROM
- PROVISIONING_ENTRY
-
-
-
- SELECT
- *
- FROM
- PROVISIONING_ENTRY
- WHERE
- ID = #{value}
-
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ProvisioningEventMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ProvisioningEventMapper.xml
deleted file mode 100644
index 6698a6a75..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ProvisioningEventMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
- AND REQUESTTIME like '%${requestTime}%'
-
-
- AND REQUESTTIME BETWEEN #{startDate} AND #{endDate}
-
-
- AND provisioningId = #{provisioningId}
-
-
- AND ENTRYID like ${entryId}
-
-
- AND ENTRYNAME like '%${entryName}%'
-
-
- AND ENTRYTYPE = ${entryType}
-
-
- AND ACTION = ${action}
-
-
-
-
-
- SELECT
- *
- FROM PROVISIONING_EVENT
-
-
-
- SELECT COUNT(1) FROM PROVISIONING_EVENT
-
-
-
-
- SELECT
- *
- FROM
- PROVISIONING_EVENT
- WHERE
- ID = #{value}
-
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ProvisioningMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ProvisioningMapper.xml
deleted file mode 100644
index 773c1e339..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ProvisioningMapper.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
- AND NAME like '%${name}%'
-
-
- AND STATUS = #{status}
-
-
-
-
- INSERT INTO PROVISIONING(
- ID,
- NAME,
- SCHEDULE,
- APPID,
- APPNAME,
- USERCONNECTOR,
- GROUPCONNECTOR,
- ORGCONNECTOR,
- PASSWORDCONNECTOR,
- URL,
- PRINCIPAL,
- CREDENTIALS,
- PROPERTIES,
- TYPE,
- SORTORDER,
- LASTETIME,
- LASTENDETIME,
- DESCRIPTION,
- STATUS
- )VALUES(
- #{id},
- #{name},
- #{schedule},
- #{appId},
- #{appName},
- #{userConnector},
- #{groupConnector},
- #{orgConnector},
- #{passwordConnector},
- #{url},
- #{principal},
- #{credentials},
- #{properties},
- #{sortOrder},
- #{type},
- CURRENT_TIMESTAMP,
- CURRENT_TIMESTAMP,
- #{description},
- #{status}
- )
-
-
-
- UPDATE PROVISIONING SET
- NAME = #{name},
- SCHEDULE = #{schedule},
- APPID = #{appId},
- APPNAME = #{appName},
- USERCONNECTOR = #{userConnector},
- GROUPCONNECTOR = #{groupConnector},
- ORGCONNECTOR = #{orgConnector},
- PASSWORDCONNECTOR = #{passwordConnector},
- URL = #{url},
- PRINCIPAL = #{principal},
- CREDENTIALS = #{credentials},
- PROPERTIES = #{properties},
- TYPE = #{type},
- SORTORDER = #{sortOrder},
- DESCRIPTION = #{description},
- STATUS = #{status}
- WHERE
- ID = #{id}
-
-
-
- SELECT
- *
- FROM PROVISIONING
-
-
-
- SELECT COUNT(1) FROM PROVISIONING
-
-
-
-
- SELECT
- *
- FROM
- PROVISIONING
- WHERE
- ID = #{value}
-
-
-
- DELETE FROM PROVISIONING WHERE ID=#{value}
-
-
-
- DELETE FROM PROVISIONING WHERE ID=#{id}
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RegistrationMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RegistrationMapper.xml
index 7500f1df8..d2238a0d6 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RegistrationMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RegistrationMapper.xml
@@ -1,72 +1,6 @@
-
-
- INSERT INTO REGISTRATION(
- ID,
- WORKEMAIL,
- WORKPHONE,
- COMPANY ,
- USERS,
- JOBTITLE,
- LASTNAME,
- FIRSTNAME,
-
- CREATEDDATE,
-
- STATUS
- )VALUES(
- #{id},
- #{workEmail},
- #{workPhone},
- #{company} ,
- #{users},
- #{jobTitle} ,
- #{lastName},
- #{firstName},
-
- current_timestamp(),
-
- 1
- )
-
-
-
- UPDATE REGISTRATION SET
- STATUS = 13 ,
- ACTIVATEDATE = current_timestamp()
- WHERE
- ID = #{value}
-
-
-
-
- SELECT
- *
- FROM REGISTRATION
- WHERE
- ID = #{value}
- AND STATUS = 1
-
-
-
- SELECT
- ID,
- SHORTNAME
- FROM
- COMPANYS
- WHERE
- SHORTNAME = #{value}
- UNION
- SELECT
- ID,
- COMPANY SHORTNAME
- FROM
- REGISTRATION
- WHERE
- COMPANY = #{value}
-
SELECT
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ResourcesMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ResourcesMapper.xml
deleted file mode 100644
index 5972dcb3d..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/ResourcesMapper.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
- AND ID = #{id}
-
-
- AND NAME like '%#{name}%'
-
-
- AND PID = #{pId}
-
-
- AND PNAME like '%#{pName}%'
-
-
-
-
-
- SELECT
- *
- FROM RESOURCES
- WHERE 1 = 1
-
-
-
- SELECT
- *
- FROM RESOURCES
- WHERE 1 = 1
-
-
-
- INSERT INTO
- RESOURCES
- (
- ID ,
- NAME ,
- RESTYPE,
- RESACTION ,
- RESTARGET ,
- XPATH ,
- WIDTH ,
- HEIGHT ,
- PID ,
- PNAME ,
- SORTORDER,
-
- DESCRIPTION ,
- STATUS ,
- CREATEDBY,
- CREATEDDATE
- )
- VALUES
- (
- #{id},
- #{name},
- #{resType},
- #{resAction},
- #{resTarget},
- #{xpath},
- #{width},
- #{height},
- #{pId},
- #{pName},
- #{sortOrder},
-
- #{description},
- #{status},
- #{createdBy},
- current_timestamp
- )
-
-
-
- SELECT COUNT(*) FROM RESOURCES
- WHERE 1 = 1
-
-
-
- UPDATE RESOURCES SET
- NAME = #{name},
- RESTYPE = #{resType},
- RESACTION = #{resAction},
- RESTARGET = #{resTarget},
- XPATH = #{xpath},
- WIDTH = #{width},
- HEIGHT = #{height},
- PID = #{pId},
- PNAME = #{pName},
- SORTORDER = #{sortOrder},
-
- DESCRIPTION = #{description},
- STATUS = #{status},
- MODIFIEDBY = #{modifiedBy},
- MODIFIEDDATE = current_timestamp
-
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
-
-
- UPDATE RESOURCES SET STATUS = '2'
- WHERE 1 = 1
-
- AND ID = #{id}
-
-
- ADN NAME = #{name}
-
-
- ADN STATUS = '1'
-
-
- ADN XPATH = #{xPath}
-
-
-
-
- UPDATE RESOURCES SET STATUS = '2'
- WHERE ID IN
-
- #{selectId}
-
-
-
-
- DELETE FROM RESOURCES WHERE 1 = 1 AND
- (
- ID = #{id}
- OR PID = #{id}
- OR XPATH LIKE '%${id}%'
- )
-
-
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RoleUserMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RoleUserMapper.xml
index ca9f889c9..7e801eac0 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RoleUserMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RoleUserMapper.xml
@@ -17,25 +17,7 @@
-
- INSERT INTO
- ROLE_USER
- (
- ID,
- ROLEID,
- UID
- )
- VALUES
- (
- #{id},
- #{roleId},
- #{uid}
- )
-
-
- DELETE FROM ROLE_USER WHERE ROLEID = #{roleId} AND UID = #{uid}
-
SELECT
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RolesMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RolesMapper.xml
index 55b153215..b947fd4cd 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RolesMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/RolesMapper.xml
@@ -37,63 +37,7 @@
-
- SELECT
- ID,
- NAME ,
- STATUS ,
-
- CREATEDBY,
- CREATEDDATE,
- MODIFIEDBY,
- MODIFIEDDATE
- FROM ROLES
-
-
- SELECT
- ID,
- NAME ,
- STATUS ,
-
- CREATEDBY,
- CREATEDDATE,
- MODIFIEDBY,
- MODIFIEDDATE
- FROM ROLES
- WHERE
- ID = #{value}
-
-
-
- INSERT INTO
- ROLES
- (
- ID,
- NAME ,
- STATUS ,
- CREATEDBY
- )
- VALUES
- (
- #{id},
- #{name },
- #{status },
- #{createdBy}
- )
-
-
-
-
-
- UPDATE ROLES SET
- NAME = #{name},
- STATUS = #{status},
- MODIFIEDBY = #{modifiedBy},
- MODIFIEDDATE = #{modifiedDate}
- WHERE ID = #{id}
-
UPDATE ROLES SET
@@ -107,9 +51,7 @@
-
- DELETE FROM ROLES WHERE ID=#{id}
-
+
UPDATE ROLES SET STATUS='2' WHERE ID IN
@@ -118,11 +60,5 @@
-
- DELETE FROM ROLES WHERE ID IN
-
- #{item}
-
-
-
+
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml11DetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml11DetailsMapper.xml
deleted file mode 100644
index 95bc83986..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml11DetailsMapper.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
- INSERT INTO SAML_V11_DETAILS(
- ID,
- CERTISSUER,
- CERTSUBJECT,
- CERTEXPIRATION,
- KEYSTORE,
- SPACSURL,
- TARGET,
- ISSUER,
- ENTITYID,
- AUDIENCE,
- VALIDITYINTERVAL,
- NAMEIDFORMAT,
- NAMEIDCONVERT
- )VALUES(
- #{id},
- #{certIssuer},
- #{certSubject},
- #{certExpiration},
- #{keyStore},
- #{spAcsUrl},
- #{target},
- #{issuer},
- #{entityId},
- #{audience},
- #{validityInterval},
- #{nameidFormat},
- #{nameIdConvert}
- )
-
-
-
- UPDATE SAML_V11_DETAILS SET
-
- CERTISSUER = #{certIssuer},
- CERTSUBJECT = #{certSubject},
- CERTEXPIRATION = #{certExpiration},
- KEYSTORE = #{keyStore},
-
- SPACSURL = #{spAcsUrl},
- TARGET = #{target},
- ISSUER = #{issuer},
- ENTITYID = #{entityId},
- AUDIENCE = #{audience},
- VALIDITYINTERVAL = #{validityInterval},
- NAMEIDFORMAT = #{nameidFormat},
- NAMEIDCONVERT = #{nameIdConvert}
- WHERE
- ID = #{id}
-
-
-
- SELECT
- SVD.CERTISSUER,
- SVD.CERTSUBJECT,
- SVD.CERTEXPIRATION,
- SVD.KEYSTORE,
- SVD.SPACSURL,
- SVD.TARGET,
- SVD.ISSUER,
- SVD.ENTITYID,
- SVD.AUDIENCE,
- SVD.VALIDITYINTERVAL,
- SVD.NAMEIDFORMAT,
- SVD.NAMEIDCONVERT,
- APP.*
- FROM
- SAML_V11_DETAILS SVD,
- APPLICATIONS APP
- WHERE
- APP.ID = #{value}
- AND SVD.ID = #{value}
- AND SVD.ID = APP.ID
- AND APP.STATUS = 1
-
-
-
- SELECT
- SVD.CERTISSUER,
- SVD.CERTSUBJECT,
- SVD.CERTEXPIRATION,
- SVD.KEYSTORE,
- SVD.SPACSURL,
- SVD.TARGET,
- SVD.ISSUER,
- SVD.ENTITYID,
- SVD.AUDIENCE,
- SVD.VALIDITYINTERVAL,
- SVD.NAMEIDFORMAT,
- SVD.NAMEIDCONVERT,
- APP.*
- FROM
- SAML_V11_DETAILS SVD,
- SAAS_APP_TEMPLET APP
- WHERE
- APP.ID = #{value}
- AND SVD.ID = #{value}
- AND SVD.ID = APP.ID
- AND APP.STATUS = 1
-
-
-
- DELETE FROM SAML_V11_DETAILS WHERE ID=#{value}
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20DetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20DetailsMapper.xml
index 6df799ad4..669507b23 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20DetailsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20DetailsMapper.xml
@@ -2,114 +2,6 @@
-
- INSERT INTO SAML_V20_DETAILS(
- ID,
- CERTISSUER,
- CERTSUBJECT,
- CERTEXPIRATION,
- KEYSTORE,
- SPACSURL,
- ISSUER,
- ENTITYID,
- AUDIENCE,
- VALIDITYINTERVAL,
- NAMEIDFORMAT,
- ENCRYPTED,
- BINDING,
- NAMEIDCONVERT
- )VALUES(
- #{id},
- #{certIssuer},
- #{certSubject},
- #{certExpiration},
- #{keyStore},
- #{spAcsUrl},
- #{issuer},
- #{entityId},
- #{audience},
- #{validityInterval},
- #{nameidFormat},
- #{encrypted},
- #{binding},
- #{nameIdConvert}
- )
-
-
- UPDATE SAML_V20_DETAILS SET
-
- CERTISSUER = #{certIssuer},
- CERTSUBJECT = #{certSubject},
- CERTEXPIRATION = #{certExpiration},
- KEYSTORE = #{keyStore},
-
- SPACSURL = #{spAcsUrl},
- ISSUER = #{issuer},
- ENTITYID = #{entityId},
- AUDIENCE = #{audience},
- VALIDITYINTERVAL = #{validityInterval},
- NAMEIDFORMAT = #{nameidFormat},
- ENCRYPTED = #{encrypted},
- BINDING = #{binding},
- NAMEIDCONVERT = #{nameIdConvert}
- WHERE
- ID = #{id}
-
-
-
- SELECT
- SVD.CERTISSUER,
- SVD.CERTSUBJECT,
- SVD.CERTEXPIRATION,
- SVD.KEYSTORE,
- SVD.SPACSURL ,
- SVD.ISSUER,
- SVD.ENTITYID,
- SVD.AUDIENCE,
- SVD.VALIDITYINTERVAL ,
- SVD.NAMEIDFORMAT,
- SVD.ENCRYPTED,
- SVD.BINDING,
- SVD.NAMEIDCONVERT,
- APP.*
- FROM
- SAML_V20_DETAILS SVD,
- APPLICATIONS APP
- WHERE
- APP.ID = #{value}
- AND SVD.ID = #{value}
- AND SVD.ID = APP.ID
- AND APP.STATUS = 1
-
-
- SELECT
- SVD.CERTISSUER,
- SVD.CERTSUBJECT,
- SVD.CERTEXPIRATION,
- SVD.KEYSTORE,
- SVD.SPACSURL ,
- SVD.ISSUER,
- SVD.ENTITYID,
- SVD.AUDIENCE,
- SVD.VALIDITYINTERVAL ,
- SVD.NAMEIDFORMAT,
- SVD.ENCRYPTED,
- SVD.BINDING,
- SVD.NAMEIDCONVERT,
- APP.*
- FROM
- SAML_V20_DETAILS SVD,
- SAAS_APP_TEMPLET APP
- WHERE
- APP.ID = #{value}
- AND SVD.ID = #{value}
- AND SVD.ID = APP.ID
- AND APP.STATUS = 1
-
-
-
- DELETE FROM SAML_V20_DETAILS WHERE ID=#{value}
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20MetadataMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20MetadataMapper.xml
index 8051c2176..056768537 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20MetadataMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/Saml20MetadataMapper.xml
@@ -2,57 +2,5 @@
-
- INSERT INTO SAML_V20_METADATA(
- ID,
- ORGNAME,
- ORGDISPLAYNAME,
- ORGURL,
- CONTACTTYPE,
- COMPANY,
- GIVENNAME,
- SURNAME,
- EMAILADDRESS,
- TELEPHONENUMBER
-
- )VALUES(
- #{id},
- #{orgName},
- #{orgDisplayName},
- #{orgURL},
- #{contactType},
- #{company},
- #{givenName},
- #{surName},
- #{emailAddress},
- #{telephoneNumber}
- )
-
-
-
- UPDATE SAML_V20_METADATA SET
- ORGNAME = #{orgName},
- ORGDISPLAYNAME = #{orgDisplayName},
- ORGURL = #{orgURL},
- CONTACTTYPE = #{contactType},
- COMPANY = #{company},
- GIVENNAME = #{givenName},
- SURNAME = #{surName},
- EMAILADDRESS = #{emailAddress},
- TELEPHONENUMBER = #{telephoneNumber}
- WHERE
- ID = #{id}
-
-
-
- SELECT
- *
- FROM
- SAML_V20_METADATA
-
-
- WHERE ID = #{value}
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/TokenBasedDetailsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/TokenBasedDetailsMapper.xml
index 24da79881..431f2e0e2 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/TokenBasedDetailsMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/TokenBasedDetailsMapper.xml
@@ -2,71 +2,5 @@
-
- INSERT INTO TOKEN_BASED_DETAILS(
- ID,
- REDIRECTURI,
- COOKIENAME,
- ALGORITHM,
- ALGORITHMKEY,
- EXPIRES,
- UID,
- USERNAME,
- EMAIL,
- WINDOWSACCOUNT,
- EMPLOYEENUMBER,
- DEPARTMENTID,
- DEPARTMENT
- )VALUES(
- #{id},
- #{redirectUri},
- #{cookieName},
- #{algorithm},
- #{algorithmKey},
- #{expires},
- #{uid},
- #{username} ,
- #{email} ,
- #{windowsAccount},
- #{employeeNumber},
- #{departmentId},
- #{department}
- )
-
-
- UPDATE TOKEN_BASED_DETAILS SET
- REDIRECTURI = #{redirectUri},
- COOKIENAME = #{cookieName},
- ALGORITHM = #{algorithm},
- ALGORITHMKEY = #{algorithmKey},
- EXPIRES = #{expires},
- UID = #{uid},
- USERNAME = #{username},
- EMAIL = #{email},
- WINDOWSACCOUNT = #{windowsAccount},
- EMPLOYEENUMBER = #{employeeNumber},
- DEPARTMENTID = #{departmentId},
- DEPARTMENT = #{department}
-
- WHERE
- ID = #{id}
-
-
-
- SELECT
- *
- FROM
- TOKEN_BASED_DETAILS TBD,
- APPLICATIONS APP
- WHERE
- APP.ID = #{value}
- AND TBD.ID = #{value}
- AND TBD.ID = APP.ID
- AND STATUS = 1
-
-
-
- DELETE FROM TOKEN_BASED_DETAILS WHERE ID=#{value}
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserExtraMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserExtraMapper.xml
deleted file mode 100644
index 522cb088a..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserExtraMapper.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
- AND id = #{id}
-
-
- AND ATTRIBUTE LIKE '%${name}%'
-
-
- AND USERTYPEID = #{userTypeId}
-
-
-
-
- INSERT INTO USEREXTRA(
- ID,
- USERTYPEID,
- USERTYPENAME,
- ATTRIBUTENAME,
- ATTRIBUTE,
- ATTRIBUTETYPE,
- DEFAULTVALUE,
- SORTORDER,
- DESCRIPTION,
- STATUS
- )VALUES(
- #{id},
- #{userTypeId},
- #{userTypeName},
- #{attributeName},
- #{attribute},
- #{attributeType},
- #{defaultValue},
- #{sortOrder},
- #{description},
- #{status}
- )
-
-
-
- UPDATE USEREXTRA SET
- ATTRIBUTENAME = #{attributeName},
- ATTRIBUTE = #{attribute},
- ATTRIBUTETYPE = #{attributeType},
- DEFAULTVALUE = #{defaultValue},
- SORTORDER = #{sortOrder},
- DESCRIPTION = #{description},
- STATUS = #{status}
-
- WHERE
- ID = #{id}
-
-
-
- SELECT
- *
- FROM
- USEREXTRA
- WHERE
- STATUS != 9
-
-
-
- SELECT
- *
- FROM
- USEREXTRA
- WHERE
- STATUS != 9
-
-
-
- SELECT
- *
- FROM
- USEREXTRA
- WHERE
- ID = #{value}
- AND STATUS != 9
-
-
-
- SELECT
- *
- FROM
- USEREXTRA
- WHERE
- STATUS != 9
-
-
-
- SELECT
- COUNT(*)
- FROM
- USEREXTRA
- WHERE
- STATUS != 9
-
-
-
- DELETE FROM USEREXTRA WHERE ID=#{value}
-
-
-
- DELETE FROM USEREXTRA WHERE ID IN
-
- #{item}
-
-
-
\ No newline at end of file
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml
index 13b56e369..9f5c77008 100644
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml
+++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml
@@ -1,325 +1,9 @@
-
+
-
- INSERT INTO USERINFO(
- ID,
- USERNAME,
- PASSWORD,
- DECIPHERABLE,
- USERTYPE,
- WINDOWSACCOUNT,
-
- DISPLAYNAME ,
- NICKNAME ,
- NAMEZHSPELL,
- NAMEZHSHORTSPELL,
- GIVENNAME ,
- MIDDLENAME ,
- FAMILYNAME ,
- HONORIFICPREFIX ,
- HONORIFICSUFFIX ,
- FORMATTEDNAME ,
- MARRIED,
- GENDER,
- BIRTHDATE,
- PICTURE,
- IDTYPE,
- IDCARDNO ,
- WEBSITE,
-
- AUTHNTYPE,
- MOBILE,
- MOBILEVERIFIED ,
- EMAIL,
- EMAILVERIFIED,
- PASSWORDQUESTION,
- PASSWORDANSWER,
- APPLOGINPASSWORD,
- PROTECTEDAPPS,
-
- LASTLOGINTIME,
- LASTLOGOFFTIME,
- PASSWORDLASTSETTIME,
- BADPASSWORDCOUNT,
- UNLOCKTIME,
- ISLOCKED,
- LOCALE,
- TIMEZONE,
- PREFERREDLANGUAGE,
-
- WORKCOUNTRY,
- WORKREGION,
- WORKLOCALITY,
- WORKSTREETADDRESS,
- WORKADDRESSFORMATTED,
- WORKEMAIL,
- WORKPHONENUMBER,
- WORKPOSTALCODE,
- WORKFAX,
-
- HOMECOUNTRY,
- HOMEREGION,
- HOMELOCALITY,
- HOMESTREETADDRESS,
- HOMEADDRESSFORMATTED,
- HOMEEMAIL,
- HOMEPHONENUMBER,
- HOMEPOSTALCODE,
- HOMEFAX,
-
- EMPLOYEENUMBER,
- DIVISION,
- COSTCENTER,
- ORGANIZATION,
- DEPARTMENTID,
- DEPARTMENT,
- JOBTITLE,
- JOBLEVEL,
- MANAGERID,
- MANAGER,
- ASSISTANTID,
- ASSISTANT,
- ENTRYDATE,
- QUITDATE,
- STARTWORKDATE,
-
- QQ,
- WEIXIN,
- SINAWEIBO,
- YIXIN,
- FACEBOOK,
- SKYPE,
- MSN,
- GTALK,
- YAHOO,
- LINE,
- AIM,
- DEFINEIM,
- EXTRAATTRIBUTE,
-
- SORTORDER,
-
- CREATEDBY,
- CREATEDDATE,
- MODIFIEDBY,
- MODIFIEDDATE,
-
- STATUS
- )VALUES(
- #{id},
- #{username},
- #{password},
- #{decipherable},
- #{userType},
- #{windowsAccount} ,
-
- #{displayName} ,
- #{nickName},
- #{nameZHSpell},
- #{nameZHShortSpell},
- #{givenName},
- #{middleName},
- #{familyName},
- #{honorificPrefix},
- #{honorificSuffix},
- #{formattedName},
- #{married},
- #{gender},
- #{birthDate},
- #{picture},
- #{idType},
- #{idCardNo},
- #{webSite},
-
- #{authnType},
- #{mobile} ,
- #{mobileVerified} ,
- #{email},
- #{emailVerified} ,
-
- #{passwordQuestion},
- #{passwordAnswer} ,
- #{appLoginPassword} ,
- #{protectedApps} ,
-
- #{lastLoginTime},
- #{lastLogoffTime},
- #{passwordLastSetTime},
- #{badPasswordCount} ,
- #{unLockTime},
- #{isLocked},
- #{locale},
- #{timeZone} ,
- #{preferredLanguage},
-
- #{workCountry},
- #{workRegion} ,
- #{workLocality},
- #{workStreetAddress},
- #{workAddressFormatted},
- #{workEmail} ,
- #{workPhoneNumber},
- #{workPostalCode},
- #{workFax},
-
- #{homeCountry},
- #{homeRegion} ,
- #{homeLocality},
- #{homeStreetAddress},
- #{homeAddressFormatted},
- #{homeEmail} ,
- #{homePhoneNumber},
- #{homePostalCode},
- #{homeFax},
-
- #{employeeNumber},
- #{division},
- #{costCenter},
- #{organization},
- #{departmentId},
- #{department},
- #{jobTitle},
- #{jobLevel},
- #{managerId},
- #{manager},
- #{assistantId},
- #{assistant},
- #{entryDate},
- #{quitDate},
- #{startWorkDate},
-
- #{qq},
- #{weixin},
- #{sinaweibo},
- #{yixin},
- #{facebook},
- #{skype},
- #{msn},
- #{gtalk},
- #{yahoo},
- #{line},
- #{aim},
- #{defineIm},
-
- #{extraAttribute},
-
- #{sortOrder},
-
- #{createdBy},
- #{createdDate} ,
- #{modifiedBy},
- #{modifiedDate},
-
- #{status}
- )
-
-
-
- UPDATE USERINFO SET
- WINDOWSACCOUNT = #{windowsAccount},
-
- DISPLAYNAME = #{displayName},
- NICKNAME = #{nickName},
- NAMEZHSPELL = #{nameZHSpell},
- NAMEZHSHORTSPELL= #{nameZHShortSpell},
- GIVENNAME = #{givenName},
- MIDDLENAME = #{middleName},
- FAMILYNAME = #{familyName},
- HONORIFICPREFIX = #{honorificPrefix},
- HONORIFICSUFFIX = #{honorificSuffix},
- FORMATTEDNAME = #{formattedName} ,
- MARRIED = #{married},
- GENDER = #{gender},
- BIRTHDATE = #{birthDate},
-
- PICTURE = #{picture},
-
- IDTYPE = #{idType},
- IDCARDNO = #{idCardNo},
- WEBSITE = #{webSite},
-
- LOCALE = #{locale},
- TIMEZONE = #{timeZone},
- PREFERREDLANGUAGE= #{preferredLanguage},
-
- WORKCOUNTRY = #{workCountry},
- WORKREGION = #{workRegion},
- WORKLOCALITY = #{workLocality},
- WORKSTREETADDRESS= #{workStreetAddress},
- WORKADDRESSFORMATTED= #{workAddressFormatted},
- WORKEMAIL = #{workEmail},
- WORKPHONENUMBER = #{workPhoneNumber},
- WORKPOSTALCODE = #{workPostalCode},
- WORKFAX = #{workFax},
-
- HOMECOUNTRY = #{homeCountry},
- HOMEREGION = #{homeRegion},
- HOMELOCALITY = #{homeLocality},
- HOMESTREETADDRESS= #{homeStreetAddress},
- HOMEADDRESSFORMATTED= #{homeAddressFormatted},
- HOMEEMAIL = #{homeEmail},
- HOMEPHONENUMBER= #{homePhoneNumber},
- HOMEPOSTALCODE = #{homePostalCode},
- HOMEFAX = #{homeFax},
-
- EMPLOYEENUMBER = #{employeeNumber},
- DIVISION = #{division},
- COSTCENTER = #{costCenter},
- ORGANIZATION = #{organization},
- DEPARTMENTID = #{departmentId},
- DEPARTMENT = #{department},
- JOBTITLE = #{jobTitle},
- JOBLEVEL = #{jobLevel},
- MANAGERID = #{managerId},
- MANAGER = #{manager},
- ASSISTANTID = #{assistantId},
- ASSISTANT = #{assistant},
- ENTRYDATE = #{entryDate},
- QUITDATE = #{quitDate},
- STARTWORKDATE = #{startWorkDate},
-
- QQ = #{qq},
- WEIXIN = #{weixin},
- SINAWEIBO = #{sinaweibo},
- YIXIN = #{yixin},
- FACEBOOK = #{facebook},
- SKYPE = #{skype},
- MSN = #{msn},
- GTALK = #{gtalk},
- YAHOO = #{yahoo},
- LINE = #{line},
- AIM = #{aim},
- DEFINEIM = #{defineIm},
-
- EXTRAATTRIBUTE = #{extraAttribute},
- SORTORDER = #{sortOrder},
- STATUS = #{status},
- MODIFIEDBY = #{modifiedBy},
- MODIFIEDDATE = current_timestamp
- WHERE
- ID = #{id}
-
-
-
- DELETE FROM USERINFO WHERE ID = #{value}
-
-
-
-
-
- SELECT
- *
- FROM
- USERINFO
- WHERE
- (1=1)
-
- AND USERNAME = #{username}
-
- ORDER BY SORTORDER
-
+
+
SELECT
@@ -409,32 +93,6 @@
-
- SELECT
- *
- FROM
- USERINFO
- WHERE
- (1=1)
-
- AND USERNAME = #{username}
-
-
- AND ID = #{id}
-
-
- AND USERTYPE = #{userType}
-
-
-
-
- SELECT
- *
- FROM
- USERINFO
- WHERE
- ID = #{value}
-
UPDATE USERINFO SET
diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserTypeMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserTypeMapper.xml
deleted file mode 100644
index 4052bcfac..000000000
--- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserTypeMapper.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
- AND id = #{id}
-
-
- AND NAME LIKE '%${name}%'
-
-
-
-
- INSERT INTO USERTYPE(
- ID,
- NAME,
- SORTORDER,
- DESCRIPTION,
- STATUS
-
- )VALUES(
- #{id},
- #{name},
- #{sortOrder},
- #{description},
- #{status}
- )
-
-
-
- UPDATE USERTYPE SET
- NAME = #{name},
- SORTORDER = #{sortOrder},
- DESCRIPTION = #{description},
- STATUS = #{status}
-
- WHERE
- ID = #{id}
-
-
-
- SELECT
- *
- FROM
- USERTYPE
- WHERE
- STATUS = 3
-
-
-
- SELECT
- *
- FROM
- USERTYPE
- WHERE
- STATUS != 9
-
-
-
- SELECT
- *
- FROM
- USERTYPE
- WHERE
- ID = #{value}
- AND STATUS != 9
-
-
-
- SELECT
- *
- FROM
- USERTYPE
- WHERE
- STATUS != 9
-
-
-
- SELECT
- COUNT(*)
- FROM
- USERTYPE
- WHERE
- STATUS != 9
-
-
-
- DELETE FROM USERTYPE WHERE ID=#{value}
-
-
\ No newline at end of file
diff --git a/maxkey-demos/.classpath b/maxkey-demos/.classpath
index 8d8d85f14..eb19361b5 100644
--- a/maxkey-demos/.classpath
+++ b/maxkey-demos/.classpath
@@ -2,5 +2,5 @@
diff --git a/maxkey-demos/.project b/maxkey-demos/.project
index 4e592438b..60f1dc711 100644
--- a/maxkey-demos/.project
+++ b/maxkey-demos/.project
@@ -1,7 +1,7 @@
maxkey-demos
- Project maxkey-demos created by Buildship.
+
@@ -17,7 +17,7 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-demos/.settings/org.eclipse.jdt.core.prefs b/maxkey-demos/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-demos/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-demos/maxkey-demo-cas/.classpath b/maxkey-demos/maxkey-demo-cas/.classpath
index 394f57b8c..708b1a19b 100644
--- a/maxkey-demos/maxkey-demo-cas/.classpath
+++ b/maxkey-demos/maxkey-demo-cas/.classpath
@@ -1,6 +1,11 @@
-
+
+
+
@@ -8,5 +13,5 @@
-
diff --git a/maxkey-demos/maxkey-demo-cas/.project b/maxkey-demos/maxkey-demo-cas/.project
index 012718d1e..8ca5b8013 100644
--- a/maxkey-demos/maxkey-demo-cas/.project
+++ b/maxkey-demos/maxkey-demo-cas/.project
@@ -1,7 +1,7 @@
maxkey-demo-cas
- Project maxkey-demo-cas created by Buildship.
+ maxkey-demo-cas
@@ -27,10 +27,10 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.jdt.core.prefs b/maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.wst.common.component b/maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.wst.common.component
index a6522799e..4cc9bdfa3 100644
--- a/maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.wst.common.component
+++ b/maxkey-demos/maxkey-demo-cas/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
-
+
+
+
+
+
+
+
@@ -9,5 +19,5 @@
-
diff --git a/maxkey-demos/maxkey-demo-jwt/.project b/maxkey-demos/maxkey-demo-jwt/.project
index 460740672..883b8a7d6 100644
--- a/maxkey-demos/maxkey-demo-jwt/.project
+++ b/maxkey-demos/maxkey-demo-jwt/.project
@@ -1,7 +1,7 @@
maxkey-demo-jwt
- Project maxkey-demo-jwt created by Buildship.
+ maxkey-demo-jwt
@@ -27,10 +27,10 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.jdt.core.prefs b/maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.wst.common.component b/maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.wst.common.component
index 67b979ca5..ddebad449 100644
--- a/maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.wst.common.component
+++ b/maxkey-demos/maxkey-demo-jwt/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
-
+
+
+
@@ -8,5 +13,5 @@
-
diff --git a/maxkey-demos/maxkey-demo-ltpa/.project b/maxkey-demos/maxkey-demo-ltpa/.project
index caad908e3..56f3f11f8 100644
--- a/maxkey-demos/maxkey-demo-ltpa/.project
+++ b/maxkey-demos/maxkey-demo-ltpa/.project
@@ -1,7 +1,7 @@
maxkey-demo-ltpa
- Project maxkey-demo-ltpa created by Buildship.
+ maxkey-demo-ltpa
@@ -27,10 +27,10 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.jdt.core.prefs b/maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.wst.common.component b/maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.wst.common.component
index 69aa2bc0e..17420b27f 100644
--- a/maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.wst.common.component
+++ b/maxkey-demos/maxkey-demo-ltpa/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
-
+
+
+
+
+
+
+
@@ -9,5 +19,5 @@
-
diff --git a/maxkey-demos/maxkey-demo-oauth/.project b/maxkey-demos/maxkey-demo-oauth/.project
index 60e623e0c..84fab2d44 100644
--- a/maxkey-demos/maxkey-demo-oauth/.project
+++ b/maxkey-demos/maxkey-demo-oauth/.project
@@ -1,7 +1,7 @@
maxkey-demo-oauth
- Project maxkey-demo-oauth created by Buildship.
+ maxkey-demo-oauth
@@ -27,10 +27,10 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.jdt.core.prefs b/maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.wst.common.component b/maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.wst.common.component
index 9f68dac91..3cfc29710 100644
--- a/maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.wst.common.component
+++ b/maxkey-demos/maxkey-demo-oauth/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -10,5 +25,5 @@
-
diff --git a/maxkey-demos/maxkey-demo-saml/.project b/maxkey-demos/maxkey-demo-saml/.project
index 42544b30e..74e945c47 100644
--- a/maxkey-demos/maxkey-demo-saml/.project
+++ b/maxkey-demos/maxkey-demo-saml/.project
@@ -1,7 +1,7 @@
maxkey-demo-saml
- Project maxkey-demo-saml created by Buildship.
+ maxkey-demo-saml
@@ -27,10 +27,10 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-demos/maxkey-demo-saml/.settings/org.eclipse.jdt.core.prefs b/maxkey-demos/maxkey-demo-saml/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-demos/maxkey-demo-saml/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-demos/maxkey-demo-saml/.settings/org.eclipse.wst.common.component b/maxkey-demos/maxkey-demo-saml/.settings/org.eclipse.wst.common.component
index f398b792a..254669557 100644
--- a/maxkey-demos/maxkey-demo-saml/.settings/org.eclipse.wst.common.component
+++ b/maxkey-demos/maxkey-demo-saml/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
Test results - Class com.connsec.saml.AuthnRequestGeneratorXMLTest
-
-
Class com.connsec.saml.AuthnRequestGeneratorXMLTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testGenerateAuthnRequest
-1.863s
-passed
-
-
-
-
-
Standard output
-
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 198] Preparing to load IDAttributes
-[org.opensaml.xml.XMLConfigurator:INFO {} 200] IDAttributes load complete
-[com.connsec.saml.AuthnRequestGeneratorXMLTest:DEBUG {} 71] AuthnRequest is:
-<?xml version="1.0" encoding="UTF-16"?>
-<saml2p:AuthnRequest AssertionConsumerServiceURL="https://sp.com/assertionConsumer" Destination="https://idp.com/authresponsder" ID="1234321" IssueInstant="2010-10-26T09:30:00.000Z" Version="2.0" xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol"><saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">the sp</saml2:Issuer></saml2p:AuthnRequest>
-
-
-
-
-
-
Test results - Class com.connsec.saml.PostBindingAdapterTest
-
-
Class com.connsec.saml.PostBindingAdapterTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testAfterPropertiesSet
-0.015s
-passed
-
-
-testExtractSAMLRequestMessage
-0.009s
-passed
-
-
-testExtractSAMLResponseMessage
-0.577s
-passed
-
-
-testSendSAMLMessage
-0.035s
-passed
-
-
-
-
-
-
Test results - Class com.connsec.saml.RealAssertionConsumerTest
-
-
Class com.connsec.saml.RealAssertionConsumerTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testConsume
-0.044s
-passed
-
-
-testConsumeAuthnRequestWithNoStatus
-0.007s
-passed
-
-
-testConsumeAuthnRequestWithNoStatusCode
-0.013s
-passed
-
-
-testConsumeNoAttributeStatements
-0.001s
-passed
-
-
-testConsumeNoSubject
-0.064s
-passed
-
-
-testConsumeRejectedAuthnRequest
-0.001s
-passed
-
-
-testConsumeRejectedAuthnRequestWithSubStatusCode
-0.002s
-passed
-
-
-testConsumeRejectedAuthnRequestWithSubStatusCodeAndDetails
-0.015s
-passed
-
-
-testConsumeUnknownAttributeStatements
-0.015s
-passed
-
-
-testConsumerAuthnResponseWithAssertionWithNoID
-0.008s
-passed
-
-
-testConsumerAuthnResponseWithAssertionWithNoIssuer
-0.006s
-passed
-
-
-testConsumerAuthnResponseWithEmptyAssertions
-0s
-passed
-
-
-testConsumerNoAuthnStatements
-0.059s
-passed
-
-
-testConsumerNoIssuerInstant
-0.008s
-passed
-
-
-
-
-
Standard output
-
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 198] Preparing to load IDAttributes
-[org.opensaml.xml.XMLConfigurator:INFO {} 200] IDAttributes load complete
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 69] authenticationResponseIssuingEntityName response issuer
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 71] assertion.getID() 777
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 72] assertion.getSubject().getNameID().getValue() some guy
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 76] authnStatement.getAuthnInstant() 2010-10-26T09:15:00.000Z
-[com.connsec.saml.RealAssertionConsumer:WARN {} 60] Response Message failed Validation
-org.opensaml.xml.validation.ValidationException: Assertions containing AuthnStatements require a Subject
- at org.opensaml.saml2.core.validator.AssertionSpecValidator.validateSubject(AssertionSpecValidator.java:58)
- at org.opensaml.saml2.core.validator.AssertionSpecValidator.validate(AssertionSpecValidator.java:39)
- at org.opensaml.saml2.core.validator.AssertionSpecValidator.validate(AssertionSpecValidator.java:30)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:168)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:151)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:82)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:87)
- at com.connsec.saml.xml.SAML2ValidatorSuite.validate(SAML2ValidatorSuite.java:16)
- at com.connsec.saml.RealAssertionConsumer.consume(RealAssertionConsumer.java:58)
- at com.connsec.saml.RealAssertionConsumerTest.testConsumeNoSubject(RealAssertionConsumerTest.java:354)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)
- at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
- at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)
- at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
- at org.junit.internal.runners.statements.ExpectException.evaluate(ExpectException.java:19)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
- at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
- at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
- at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
- at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
- at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:106)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
- at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:66)
- at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32)
- at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)
- at com.sun.proxy.$Proxy1.processTestClass(Unknown Source)
- at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:109)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:155)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:137)
- at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:404)
- at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:63)
- at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:46)
- at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
- at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
- at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:55)
- at java.lang.Thread.run(Thread.java:745)
-[com.connsec.saml.RealAssertionConsumer:WARN {} 60] Response Message failed Validation
-org.opensaml.xml.validation.ValidationException: ID is required attribute
- at org.opensaml.saml2.core.validator.AssertionSchemaValidator.validateID(AssertionSchemaValidator.java:78)
- at org.opensaml.saml2.core.validator.AssertionSchemaValidator.validate(AssertionSchemaValidator.java:42)
- at org.opensaml.saml2.core.validator.AssertionSchemaValidator.validate(AssertionSchemaValidator.java:31)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:168)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:151)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:82)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:87)
- at com.connsec.saml.xml.SAML2ValidatorSuite.validate(SAML2ValidatorSuite.java:14)
- at com.connsec.saml.RealAssertionConsumer.consume(RealAssertionConsumer.java:58)
- at com.connsec.saml.RealAssertionConsumerTest.testConsumerAuthnResponseWithAssertionWithNoID(RealAssertionConsumerTest.java:291)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)
- at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
- at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)
- at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
- at org.junit.internal.runners.statements.ExpectException.evaluate(ExpectException.java:19)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
- at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
- at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
- at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
- at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
- at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:106)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
- at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:66)
- at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32)
- at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)
- at com.sun.proxy.$Proxy1.processTestClass(Unknown Source)
- at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:109)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:155)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:137)
- at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:404)
- at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:63)
- at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:46)
- at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
- at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
- at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:55)
- at java.lang.Thread.run(Thread.java:745)
-[com.connsec.saml.RealAssertionConsumer:WARN {} 60] Response Message failed Validation
-org.opensaml.xml.validation.ValidationException: Issuer is required element
- at org.opensaml.saml2.core.validator.AssertionSchemaValidator.validateIssuer(AssertionSchemaValidator.java:54)
- at org.opensaml.saml2.core.validator.AssertionSchemaValidator.validate(AssertionSchemaValidator.java:40)
- at org.opensaml.saml2.core.validator.AssertionSchemaValidator.validate(AssertionSchemaValidator.java:31)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:168)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:151)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:82)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:87)
- at com.connsec.saml.xml.SAML2ValidatorSuite.validate(SAML2ValidatorSuite.java:14)
- at com.connsec.saml.RealAssertionConsumer.consume(RealAssertionConsumer.java:58)
- at com.connsec.saml.RealAssertionConsumerTest.testConsumerAuthnResponseWithAssertionWithNoIssuer(RealAssertionConsumerTest.java:315)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)
- at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
- at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)
- at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
- at org.junit.internal.runners.statements.ExpectException.evaluate(ExpectException.java:19)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
- at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
- at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
- at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
- at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
- at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:106)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
- at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:66)
- at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32)
- at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)
- at com.sun.proxy.$Proxy1.processTestClass(Unknown Source)
- at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:109)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:155)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:137)
- at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:404)
- at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:63)
- at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:46)
- at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
- at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
- at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:55)
- at java.lang.Thread.run(Thread.java:745)
-[com.connsec.saml.RealAssertionConsumer:WARN {} 132] Extra information extracted from authentication failure was urn:oasis:names:tc:SAML:2.0:status:AuthnFailed - org.opensaml.saml2.core.impl.StatusMessageImpl@1b06f3e4
-[com.connsec.saml.RealAssertionConsumer:WARN {} 132] Extra information extracted from authentication failure was urn:oasis:names:tc:SAML:2.0:status:AuthnFailed
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 69] authenticationResponseIssuingEntityName response issuer
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 71] assertion.getID() 777
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 72] assertion.getSubject().getNameID().getValue() some guy
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 76] authnStatement.getAuthnInstant() 2010-10-26T09:15:00.000Z
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 103] found Granted Authorities.
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 79] Granted Authorities will be [ROLE_1, ROLE_2]
-[com.connsec.saml.RealAssertionConsumer:DEBUG {} 82] assertion.getID() [org.opensaml.saml2.core.impl.AuthnStatementImpl@27f6fe3]
-[com.connsec.saml.RealAssertionConsumer:WARN {} 60] Response Message failed Validation
-org.opensaml.xml.validation.ValidationException: Status is required
- at org.opensaml.saml2.core.validator.StatusResponseTypeSchemaValidator.validateStatus(StatusResponseTypeSchemaValidator.java:57)
- at org.opensaml.saml2.core.validator.StatusResponseTypeSchemaValidator.validate(StatusResponseTypeSchemaValidator.java:42)
- at org.opensaml.saml2.core.validator.ResponseSchemaValidator.validate(ResponseSchemaValidator.java:39)
- at org.opensaml.saml2.core.validator.ResponseSchemaValidator.validate(ResponseSchemaValidator.java:28)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:168)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:151)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:82)
- at com.connsec.saml.xml.SAML2ValidatorSuite.validate(SAML2ValidatorSuite.java:14)
- at com.connsec.saml.RealAssertionConsumer.consume(RealAssertionConsumer.java:58)
- at com.connsec.saml.RealAssertionConsumerTest.testConsumeAuthnRequestWithNoStatus(RealAssertionConsumerTest.java:143)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)
- at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
- at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)
- at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
- at org.junit.internal.runners.statements.ExpectException.evaluate(ExpectException.java:19)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
- at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
- at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
- at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
- at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
- at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:106)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
- at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:66)
- at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32)
- at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)
- at com.sun.proxy.$Proxy1.processTestClass(Unknown Source)
- at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:109)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:155)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:137)
- at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:404)
- at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:63)
- at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:46)
- at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
- at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
- at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:55)
- at java.lang.Thread.run(Thread.java:745)
-[com.connsec.saml.RealAssertionConsumer:WARN {} 60] Response Message failed Validation
-org.opensaml.xml.validation.ValidationException: IssueInstant is required attribute
- at org.opensaml.saml2.core.validator.AssertionSchemaValidator.validateIssueInstant(AssertionSchemaValidator.java:90)
- at org.opensaml.saml2.core.validator.AssertionSchemaValidator.validate(AssertionSchemaValidator.java:43)
- at org.opensaml.saml2.core.validator.AssertionSchemaValidator.validate(AssertionSchemaValidator.java:31)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:168)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:151)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:82)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:87)
- at com.connsec.saml.xml.SAML2ValidatorSuite.validate(SAML2ValidatorSuite.java:14)
- at com.connsec.saml.RealAssertionConsumer.consume(RealAssertionConsumer.java:58)
- at com.connsec.saml.RealAssertionConsumerTest.testConsumerNoIssuerInstant(RealAssertionConsumerTest.java:374)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)
- at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
- at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)
- at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
- at org.junit.internal.runners.statements.ExpectException.evaluate(ExpectException.java:19)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
- at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
- at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
- at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
- at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
- at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:106)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
- at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:66)
- at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32)
- at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)
- at com.sun.proxy.$Proxy1.processTestClass(Unknown Source)
- at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:109)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:155)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:137)
- at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:404)
- at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:63)
- at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:46)
- at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
- at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
- at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:55)
- at java.lang.Thread.run(Thread.java:745)
-[com.connsec.saml.RealAssertionConsumer:WARN {} 60] Response Message failed Validation
-org.opensaml.xml.validation.ValidationException: StatusCode is required
- at org.opensaml.saml2.core.validator.StatusSchemaValidator.validateStatusCode(StatusSchemaValidator.java:46)
- at org.opensaml.saml2.core.validator.StatusSchemaValidator.validate(StatusSchemaValidator.java:40)
- at org.opensaml.saml2.core.validator.StatusSchemaValidator.validate(StatusSchemaValidator.java:29)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:168)
- at org.opensaml.xml.validation.ValidatorSuite.performValidation(ValidatorSuite.java:151)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:82)
- at org.opensaml.xml.validation.ValidatorSuite.validate(ValidatorSuite.java:87)
- at com.connsec.saml.xml.SAML2ValidatorSuite.validate(SAML2ValidatorSuite.java:14)
- at com.connsec.saml.RealAssertionConsumer.consume(RealAssertionConsumer.java:58)
- at com.connsec.saml.RealAssertionConsumerTest.testConsumeAuthnRequestWithNoStatusCode(RealAssertionConsumerTest.java:162)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)
- at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
- at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)
- at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
- at org.junit.internal.runners.statements.ExpectException.evaluate(ExpectException.java:19)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
- at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
- at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
- at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
- at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
- at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:106)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
- at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:66)
- at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32)
- at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)
- at com.sun.proxy.$Proxy1.processTestClass(Unknown Source)
- at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:109)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:155)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:137)
- at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:404)
- at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:63)
- at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:46)
- at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
- at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
- at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:55)
- at java.lang.Thread.run(Thread.java:745)
-
-
-
-
-
-
Test results - Class com.connsec.saml.SecurityPolicyDelegateTest
-
-
Class com.connsec.saml.SecurityPolicyDelegateTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testEvaluate
-0.003s
-passed
-
-
-testGetPolicyRules
-0.055s
-passed
-
-
-
-
-
-
Test results - Class com.connsec.saml.SignatureSecurityPolicyRuleTest
-
-
Class com.connsec.saml.SignatureSecurityPolicyRuleTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testAfterPropertiesSet
-0.008s
-passed
-
-
-testEvaluate
-0.010s
-passed
-
-
-testInboundMessageIsNotSignable
-0.008s
-passed
-
-
-testInboundMessageIsNotSigned
-0.005s
-passed
-
-
-testInvalidMessageSignature
-0.140s
-passed
-
-
-testTruestEngineThrowsException
-0.007s
-passed
-
-
-testValidatorThrowsValdiationException
-0.010s
-passed
-
-
-
-
-
Standard output
-
-[com.connsec.saml.binding.SignatureSecurityPolicyRule:DEBUG {} 74] evaluating signature of messageContext
-[com.connsec.saml.binding.SignatureSecurityPolicyRule:DEBUG {} 95] Inbound issuer is the issuer
-[com.connsec.saml.binding.SignatureSecurityPolicyRule:DEBUG {} 74] evaluating signature of messageContext
-[com.connsec.saml.binding.SignatureSecurityPolicyRule:DEBUG {} 74] evaluating signature of messageContext
-[com.connsec.saml.binding.SignatureSecurityPolicyRule:DEBUG {} 74] evaluating signature of messageContext
-[com.connsec.saml.binding.SignatureSecurityPolicyRule:DEBUG {} 74] evaluating signature of messageContext
-[com.connsec.saml.binding.SignatureSecurityPolicyRule:DEBUG {} 95] Inbound issuer is the issuer
-[com.connsec.saml.binding.SignatureSecurityPolicyRule:DEBUG {} 74] evaluating signature of messageContext
-
-
-
-
-
-
Test results - Class com.connsec.saml.xml.EndpointGeneratorTest
-
-
Class com.connsec.saml.xml.EndpointGeneratorTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testGenerateEndPoint
-0.020s
-passed
-
-
-testGenerateEndPointNoResponseLocation
-0.015s
-passed
-
-
-
-
-
Standard output
-
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 198] Preparing to load IDAttributes
-[org.opensaml.xml.XMLConfigurator:INFO {} 200] IDAttributes load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 198] Preparing to load IDAttributes
-[org.opensaml.xml.XMLConfigurator:INFO {} 200] IDAttributes load complete
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 38] end point service: {urn:oasis:names:tc:SAML:2.0:metadata}SingleSignOnService
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 39] end point location: https://them.com/destination
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 40] end point responseLocation: https://me.com/reply
-[com.connsec.saml.xml.EndpointGeneratorTest:DEBUG {} 52] xml is <?xml version="1.0" encoding="UTF-16"?>
-<md:SingleSignOnService Location="https://them.com/destination" ResponseLocation="https://me.com/reply" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 38] end point service: {urn:oasis:names:tc:SAML:2.0:metadata}SingleSignOnService
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 39] end point location: https://them.com/destination
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 40] end point responseLocation: null
-[com.connsec.saml.xml.EndpointGeneratorTest:DEBUG {} 78] xml is <?xml version="1.0" encoding="UTF-16"?>
-<md:SingleSignOnService Location="https://them.com/destination" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
-
-
-
-
-
-
Test results - Class com.connsec.saml.xml.IssuerGeneratorTest
-
-
Class com.connsec.saml.xml.IssuerGeneratorTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testGenerate
-0.010s
-passed
-
-
-
-
-
Standard output
-
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 198] Preparing to load IDAttributes
-[org.opensaml.xml.XMLConfigurator:INFO {} 200] IDAttributes load complete
-[com.connsec.saml.xml.IssuerGeneratorTest:DEBUG {} 47] AuthnRequest is:
-<?xml version="1.0" encoding="UTF-16"?>
-<saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">some guy</saml2:Issuer>
-
-
-
-
-
-
Test results - Class com.connsec.spring.RealAuthenticationFailureHandlerTest
-
-
Class com.connsec.spring.RealAuthenticationFailureHandlerTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testOnAuthnFailureIdentityProviderException
-0.008s
-passed
-
-
-testOnAuthnFailureServiceProviderException
-0.048s
-passed
-
-
-
-
-
Standard output
-
-[com.connsec.spring.RealAuthenticationFailureHandler:DEBUG {} 70] saved Request: savedRequest
-[com.connsec.spring.RealAuthenticationFailureHandler:WARN {} 80] Unrecoverable authn failure. Sending to Forbidden
-[com.connsec.spring.RealAuthenticationFailureHandler:DEBUG {} 70] saved Request: savedRequest
-[com.connsec.spring.RealAuthenticationFailureHandler:WARN {} 74] Authn Failure reported by the IDP.
-[com.connsec.spring.RealAuthenticationFailureHandler:DEBUG {} 75] Retry original request of http://sp/protected
-
-
-
-
-
-
Test results - Class com.connsec.spring.SAMLAuthenticationEntryPointIntTest
-
-
Class com.connsec.spring.SAMLAuthenticationEntryPointIntTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testCommence
-6.729s
-passed
-
-
-
-
-
Standard output
-
-[org.springframework.test.context.TestContextManager:INFO {} 185] @TestExecutionListeners is not present for class [class com.connsec.spring.SAMLAuthenticationEntryPointIntTest]: using defaults.
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 198] Preparing to load IDAttributes
-[org.opensaml.xml.XMLConfigurator:INFO {} 200] IDAttributes load complete
-[org.springframework.beans.factory.xml.XmlBeanDefinitionReader:INFO {} 315] Loading XML bean definitions from URL [file:src/main/webapp/WEB-INF/spring/applicationContext-property-mappings.xml]
-[org.springframework.beans.factory.xml.XmlBeanDefinitionReader:INFO {} 315] Loading XML bean definitions from URL [file:src/main/webapp/WEB-INF/spring/applicationContext-sp-config.xml]
-[org.springframework.beans.factory.xml.XmlBeanDefinitionReader:INFO {} 315] Loading XML bean definitions from URL [file:src/main/webapp/WEB-INF/spring/applicationContext-spring-security.xml]
-[org.springframework.security.core.SpringSecurityCoreVersion:INFO {} 33] You are running with Spring Security Core 3.1.0.RELEASE
-[org.springframework.security.config.SecurityNamespaceHandler:INFO {} 57] Spring Security 'config' module version is 3.1.0.RELEASE
-[org.springframework.security.config.http.HttpSecurityBeanDefinitionParser:INFO {} 229] Checking sorted filter chain: [Root bean: class [org.springframework.security.web.context.SecurityContextPersistenceFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 300, Root bean: class [org.springframework.security.web.authentication.logout.LogoutFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 400, <samlSolicitedFilter>, order = 600, Root bean: class [org.springframework.security.web.savedrequest.RequestCacheAwareFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1300, Root bean: class [org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1400, Root bean: class [org.springframework.security.web.authentication.AnonymousAuthenticationFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1700, Root bean: class [org.springframework.security.web.session.SessionManagementFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1800, Root bean: class [org.springframework.security.web.access.ExceptionTranslationFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1900, <org.springframework.security.web.access.intercept.FilterSecurityInterceptor#0>, order = 2000]
-[org.springframework.context.support.GenericApplicationContext:INFO {} 495] Refreshing org.springframework.context.support.GenericApplicationContext@10f46162: startup date [Tue Mar 05 21:23:51 GMT+08:00 2019]; root of context hierarchy
-[org.springframework.beans.factory.config.PropertyPlaceholderConfigurer:INFO {} 177] Loading properties file from class path resource [application.properties]
-[org.springframework.beans.factory.support.DefaultListableBeanFactory:INFO {} 557] Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@33bbcaf4: defining beans [mappings,samlInitializer,timeService,idService,velocityEngine,samlParserPool,decoder,bindingAdpater,securityPolicyResolver,securityPolicy,mapBasedStorageService,replayCache,messageReplayRule,issueInstantRule,signatureSecurityPolicyRule,keyStoreCredentialResolverDelegate,assertionConsumer,org.springframework.security.filterChains,org.springframework.security.filterChainProxy,org.springframework.security.web.PortMapperImpl#0,org.springframework.security.config.authentication.AuthenticationManagerFactoryBean#0,org.springframework.security.authentication.ProviderManager#0,org.springframework.security.web.context.HttpSessionSecurityContextRepository#0,org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy#0,org.springframework.security.web.savedrequest.HttpSessionRequestCache#0,org.springframework.security.access.vote.AffirmativeBased#0,org.springframework.security.web.access.intercept.FilterSecurityInterceptor#0,org.springframework.security.web.access.DefaultWebInvocationPrivilegeEvaluator#0,org.springframework.security.authentication.AnonymousAuthenticationProvider#0,org.springframework.security.userDetailsServiceFactory,org.springframework.security.web.DefaultSecurityFilterChain#0,org.springframework.security.authentication.DefaultAuthenticationEventPublisher#0,org.springframework.security.authenticationManager,samlAuthenticationProvider,authenticationFailureHandler,samlSolicitedFilter,samlAuthenticationEntryPoint,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,org.springframework.context.annotation.ConfigurationClassPostProcessor$ImportAwareBeanPostProcessor#0]; root of factory hierarchy
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 198] Preparing to load IDAttributes
-[org.opensaml.xml.XMLConfigurator:INFO {} 200] IDAttributes load complete
-[org.apache.velocity.app.VelocityEngine:INFO {} 49] LogSystem has been deprecated. Please use a LogChute implementation.
-[org.springframework.security.web.DefaultSecurityFilterChain:INFO {} 28] Creating filter chain: org.springframework.security.web.util.AnyRequestMatcher@1, [org.springframework.security.web.context.SecurityContextPersistenceFilter@603f2075, org.springframework.security.web.authentication.logout.LogoutFilter@65f979c6, com.connsec.spring.SAMLResponseAuthenticationProcessingFilter@4cddcb10, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@74ba18e8, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@6d1fb282, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@4386c1ae, org.springframework.security.web.session.SessionManagementFilter@61a11785, org.springframework.security.web.access.ExceptionTranslationFilter@45f83e01, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@55e31f9e]
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 38] end point service: {urn:oasis:names:tc:SAML:2.0:metadata}SingleSignOnService
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 39] end point location: http://login.connsec.com/sec/authorize/saml20/ce8b08e9-b884-4d1f-a795-01ae25f63d48
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 40] end point responseLocation: http://saml.connsec.com/saml2sp/index
-[com.connsec.spring.SAMLAuthenticationEntryPoint:DEBUG {} 114] Sending authnRequest to http://login.connsec.com/sec/authorize/saml20/ce8b08e9-b884-4d1f-a795-01ae25f63d48
-[com.connsec.spring.SAMLAuthenticationEntryPointIntTest:DEBUG {} 82] The response was:
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
- <body onload="document.forms[0].submit()">
- <noscript>
- <p>
- <strong>Note:</strong> Since your browser does not support JavaScript,
- you must press the Continue button once to proceed.
- </p>
- </noscript>
-
- <form action="http://login.connsec.com/sec/authorize/saml20/ce8b08e9-b884-4d1f-a795-01ae25f63d48" method="post">
- <div>
-
- <input type="hidden" name="SAMLRequest" value="PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNhbWwycDpBdXRoblJlcXVlc3QgQXNzZXJ0aW9uQ29uc3VtZXJTZXJ2aWNlVVJMPSJodHRwOi8vc2FtbC5jb25uc2VjLmNvbS9zYW1sMnNwL2luZGV4IiBEZXN0aW5hdGlvbj0iaHR0cDovL2xvZ2luLmNvbm5zZWMuY29tL3NlYy9hdXRob3JpemUvc2FtbDIwL2NlOGIwOGU5LWI4ODQtNGQxZi1hNzk1LTAxYWUyNWY2M2Q0OCIgSUQ9IjUwYzBjZjk1LWMwMDUtNDQzMy1hMjY2LWMwMzM5NTY1NjJhNSIgSXNzdWVJbnN0YW50PSIyMDE5LTAzLTA1VDEzOjIzOjU1Ljc2NVoiIFZlcnNpb249IjIuMCIgeG1sbnM6c2FtbDJwPSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6cHJvdG9jb2wiPjxzYW1sMjpJc3N1ZXIgRm9ybWF0PSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6bmFtZWlkLWZvcm1hdDplbnRpdHkiIHhtbG5zOnNhbWwyPSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6YXNzZXJ0aW9uIj5zYW1sMnNwPC9zYW1sMjpJc3N1ZXI+PGRzOlNpZ25hdHVyZSB4bWxuczpkcz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnIyI+CjxkczpTaWduZWRJbmZvPgo8ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPgo8ZHM6U2lnbmF0dXJlTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3JzYS1zaGExIi8+CjxkczpSZWZlcmVuY2UgVVJJPSIjNTBjMGNmOTUtYzAwNS00NDMzLWEyNjYtYzAzMzk1NjU2MmE1Ij4KPGRzOlRyYW5zZm9ybXM+CjxkczpUcmFuc2Zvcm0gQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjZW52ZWxvcGVkLXNpZ25hdHVyZSIvPgo8ZHM6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIj48ZWM6SW5jbHVzaXZlTmFtZXNwYWNlcyBQcmVmaXhMaXN0PSJkcyBzYW1sMiBzYW1sMnAiIHhtbG5zOmVjPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzEwL3htbC1leGMtYzE0biMiLz48L2RzOlRyYW5zZm9ybT4KPC9kczpUcmFuc2Zvcm1zPgo8ZHM6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3NoYTEiLz4KPGRzOkRpZ2VzdFZhbHVlPkw0QStnNXdRcFhMK1ZoUVgrdEcvNHhnQVZ0TT08L2RzOkRpZ2VzdFZhbHVlPgo8L2RzOlJlZmVyZW5jZT4KPC9kczpTaWduZWRJbmZvPgo8ZHM6U2lnbmF0dXJlVmFsdWU+ClNxcnBFMTdWY0toSUFoUE92UVBGZkNZQzN5WXFQc0l4RkZkOTZGZkNhemtPVnJjWnB5Mk5hQU5ySDM3eFh4Nk5RZzZHdVY3NklOMHcKK0pNVkx6cnFBNXovUGVTYjVDbm5NOGhsZGVGaGdtZTZsaEVyaXRNWGd5blE4QUxmdHZLcFMvaDNnYW1kQmV3WkcrdmF4c0U1U3p3LwovZnN6OHpqOTM4YW5ZQ0t4WHRBPQo8L2RzOlNpZ25hdHVyZVZhbHVlPgo8ZHM6S2V5SW5mbz48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlDUFRDQ0FhYWdBd0lCQWdJRVZqbnlzVEFOQmdrcWhraUc5dzBCQVFVRkFEQmpNU0l3SUFZSktvWklodmNOQVFrQkZoTnpkWEJ3CmIzSjBRR052Ym01elpXTXVZMjl0TVFzd0NRWURWUVFHRXdKRFRqRVFNQTRHQTFVRUNnd0hRMjl1YmxObFl6RU1NQW9HQTFVRUN3d0QKUkdWMk1SQXdEZ1lEVlFRRERBZHpZVzFzTW5Od01CNFhEVEUxTVRFd05ERXhOVGd6TmxvWERUSTFNVEV3TkRFeE5UZ3pObG93WXpFaQpNQ0FHQ1NxR1NJYjNEUUVKQVJZVGMzVndjRzl5ZEVCamIyNXVjMlZqTG1OdmJURUxNQWtHQTFVRUJoTUNRMDR4RURBT0JnTlZCQW9NCkIwTnZibTVUWldNeEREQUtCZ05WQkFzTUEwUmxkakVRTUE0R0ExVUVBd3dIYzJGdGJESnpjRENCbnpBTkJna3Foa2lHOXcwQkFRRUYKQUFPQmpRQXdnWWtDZ1lFQWhycFIzdGlhaDRwSTR4RCttK1h2dUJJQzROb1BRVklHMDVmSkV1U3k0MGorNmVwWG94bC8zREtlTlltVApGbytPZE8xZXB3azR1aUxnZ1JGcXFiejJFRnA2Z0YxMHUwWldEMGUrRG9QRFJnUmU3dzBUc0FTU0oybmc4VWZRUDM0SUlvU0hpNmRCCjRlTktFZUJ3TUFwSFFRRFIyMDJXaHVBbkN3Y0JzbXpmR0pNQ0F3RUFBVEFOQmdrcWhraUc5dzBCQVFVRkFBT0JnUUJ1NGRLUlQwZEIKQ2I5MndudG51ckpkSzloU0kxbXJWaGJzL0FsUDZ4bXl1RXBvaWVadjNtbDdXN3V3dGFtR21KMWJtRkhvWXJoTVFvQzB5dFQza2c2dgpRRE93Vld2dnR5Mml1WUhvVnF1MEREOFdtM0pPQmJtTnNwVlRPLy9SMTdDSVVzdGNtL0tDTXA2YkRPYWJiLzNBWjBla0VWQkJVTzNQCmFWS29wdXNhR0E9PTwvZHM6WDUwOUNlcnRpZmljYXRlPjwvZHM6WDUwOURhdGE+PC9kczpLZXlJbmZvPjwvZHM6U2lnbmF0dXJlPjwvc2FtbDJwOkF1dGhuUmVxdWVzdD4="/>
-
- <input type="hidden" name="Signature" value="VZYFfzREG3z0intzG3bUsvrq5IndnFVSK/S+8mzP5qa9sax31jtPhPP+KpWmqJxqf1nOT3jAIZDWvi3fSINhQWfdIJMyRbaoBkqt2mdOkMY/15BJu/ase9W38o0VorkBsOPLLjJ+T2JTSgjK9NntCUq0ERWLQN3cgpYTiY2uvbA="/>
- <input type="hidden" name="SigAlg" value="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
- <input type="hidden" name="KeyInfo" value="PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPGRzOktleUluZm8geG1sbnM6ZHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiPjxkczpYNTA5RGF0YT48ZHM6WDUwOUNlcnRpZmljYXRlPk1JSUNQVENDQWFhZ0F3SUJBZ0lFVmpueXNUQU5CZ2txaGtpRzl3MEJBUVVGQURCak1TSXdJQVlKS29aSWh2Y05BUWtCRmhOemRYQncKYjNKMFFHTnZibTV6WldNdVkyOXRNUXN3Q1FZRFZRUUdFd0pEVGpFUU1BNEdBMVVFQ2d3SFEyOXVibE5sWXpFTU1Bb0dBMVVFQ3d3RApSR1YyTVJBd0RnWURWUVFEREFkellXMXNNbk53TUI0WERURTFNVEV3TkRFeE5UZ3pObG9YRFRJMU1URXdOREV4TlRnek5sb3dZekVpCk1DQUdDU3FHU0liM0RRRUpBUllUYzNWd2NHOXlkRUJqYjI1dWMyVmpMbU52YlRFTE1Ba0dBMVVFQmhNQ1EwNHhFREFPQmdOVkJBb00KQjBOdmJtNVRaV014RERBS0JnTlZCQXNNQTBSbGRqRVFNQTRHQTFVRUF3d0hjMkZ0YkRKemNEQ0JuekFOQmdrcWhraUc5dzBCQVFFRgpBQU9CalFBd2dZa0NnWUVBaHJwUjN0aWFoNHBJNHhEK20rWHZ1QklDNE5vUFFWSUcwNWZKRXVTeTQwais2ZXBYb3hsLzNES2VOWW1UCkZvK09kTzFlcHdrNHVpTGdnUkZxcWJ6MkVGcDZnRjEwdTBaV0QwZStEb1BEUmdSZTd3MFRzQVNTSjJuZzhVZlFQMzRJSW9TSGk2ZEIKNGVOS0VlQndNQXBIUVFEUjIwMldodUFuQ3djQnNtemZHSk1DQXdFQUFUQU5CZ2txaGtpRzl3MEJBUVVGQUFPQmdRQnU0ZEtSVDBkQgpDYjkyd250bnVySmRLOWhTSTFtclZoYnMvQWxQNnhteXVFcG9pZVp2M21sN1c3dXd0YW1HbUoxYm1GSG9ZcmhNUW9DMHl0VDNrZzZ2ClFET3dWV3Z2dHkyaXVZSG9WcXUwREQ4V20zSk9CYm1Oc3BWVE8vL1IxN0NJVXN0Y20vS0NNcDZiRE9hYmIvM0FaMGVrRVZCQlVPM1AKYVZLb3B1c2FHQT09PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+"/>
- </div>
- <noscript>
- <div>
- <input type="submit" value="Continue"/>
- </div>
- </noscript>
- </form>
-
- </body>
-</html>
-
-
-
-
-
-
Test results - Class com.connsec.spring.SAMLAuthenticationEntryPointTest
-
-
Class com.connsec.spring.SAMLAuthenticationEntryPointTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testAfterPropertiesSet
-0.006s
-passed
-
-
-testBindingAdapterThrowsMessageEncodingException
-0.016s
-passed
-
-
-testCommence
-0.027s
-passed
-
-
-
-
-
Standard output
-
-[com.connsec.spring.SAMLAuthenticationEntryPoint:DEBUG {} 114] Sending authnRequest to https://idp.com/ssoEntryPoint
-[com.connsec.spring.SAMLAuthenticationEntryPoint:DEBUG {} 114] Sending authnRequest to https://idp.com/ssoEntryPoint
-[com.connsec.spring.SAMLAuthenticationEntryPoint:ERROR {} 119] Could not send authnRequest to Identity Provider.
-org.opensaml.ws.message.encoder.MessageEncodingException: MessageEncodingException!
- at com.connsec.spring.SAMLAuthenticationEntryPoint.commence(SAMLAuthenticationEntryPoint.java:117)
- at com.connsec.spring.SAMLAuthenticationEntryPointTest.testBindingAdapterThrowsMessageEncodingException(SAMLAuthenticationEntryPointTest.java:109)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)
- at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
- at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)
- at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
- at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
- at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
- at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
- at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
- at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
- at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
- at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
- at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:106)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
- at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
- at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:66)
- at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:32)
- at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)
- at com.sun.proxy.$Proxy1.processTestClass(Unknown Source)
- at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:109)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:483)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35)
- at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:155)
- at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:137)
- at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:404)
- at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:63)
- at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:46)
- at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
- at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
- at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:55)
- at java.lang.Thread.run(Thread.java:745)
-
-
-
-
-
-
Test results - Class com.connsec.spring.SAMLResponseAuthenticationProviderTest
-
-
Class com.connsec.spring.SAMLResponseAuthenticationProviderTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testAuthenticate
-0.098s
-passed
-
-
-testDoesNotSupport
-0.019s
-passed
-
-
-testSupports
-0.007s
-passed
-
-
-
-
-
Standard output
-
-[com.connsec.spring.SAMLResponseAuthenticationProvider:DEBUG {} 47] attempting to authenticate: submitted
-[com.connsec.spring.SAMLResponseAuthenticationProvider:DEBUG {} 51] getPrincipal: response
-[com.connsec.spring.SAMLResponseAuthenticationProvider:DEBUG {} 56] Returning with authentication token of SAMLAuthenticationToken [principal=user, credentials=some b64 encoded message]
-
-
-
-
-
-
Test results - Class com.connsec.spring.UserTest
-
-
Class com.connsec.spring.UserTest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Tests
-
-
-
-Test
-Duration
-Result
-
-
-
-testEquals
-0.007s
-passed
-
-
-testHashCode
-0.020s
-passed
-
-
-testNotEquals
-0s
-passed
-
-
-
-
-
-
Test results - Test Summary
-
-
Test Summary
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Test results - Package com.connsec.saml
-
-
Package com.connsec.saml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Test results - Package com.connsec.saml.xml
-
-
Package com.connsec.saml.xml
-
-
all > com.connsec.saml.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Test results - Package com.connsec.spring
-
-
Package com.connsec.spring
-
-
all > com.connsec.spring
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-the sp
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.PostBindingAdapterTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.PostBindingAdapterTest.xml
deleted file mode 100644
index aefeb7019..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.PostBindingAdapterTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.RealAssertionConsumerTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.RealAssertionConsumerTest.xml
deleted file mode 100644
index 1f340f559..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.RealAssertionConsumerTest.xml
+++ /dev/null
@@ -1,467 +0,0 @@
-
-
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.SecurityPolicyDelegateTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.SecurityPolicyDelegateTest.xml
deleted file mode 100644
index 19d2880a3..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.SecurityPolicyDelegateTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.SignatureSecurityPolicyRuleTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.SignatureSecurityPolicyRuleTest.xml
deleted file mode 100644
index 063ca58f7..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.SignatureSecurityPolicyRuleTest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.xml.EndpointGeneratorTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.xml.EndpointGeneratorTest.xml
deleted file mode 100644
index 5c13eaa1d..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.xml.EndpointGeneratorTest.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
-
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.xml.IssuerGeneratorTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.xml.IssuerGeneratorTest.xml
deleted file mode 100644
index 7b9d5d3ad..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.saml.xml.IssuerGeneratorTest.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-some guy
-]]>
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.RealAuthenticationFailureHandlerTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.RealAuthenticationFailureHandlerTest.xml
deleted file mode 100644
index 02057e37b..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.RealAuthenticationFailureHandlerTest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.SAMLAuthenticationEntryPointIntTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.SAMLAuthenticationEntryPointIntTest.xml
deleted file mode 100644
index 04804ac7e..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.SAMLAuthenticationEntryPointIntTest.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-
-
- , order = 600, Root bean: class [org.springframework.security.web.savedrequest.RequestCacheAwareFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1300, Root bean: class [org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1400, Root bean: class [org.springframework.security.web.authentication.AnonymousAuthenticationFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1700, Root bean: class [org.springframework.security.web.session.SessionManagementFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1800, Root bean: class [org.springframework.security.web.access.ExceptionTranslationFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1900, , order = 2000]
-[org.springframework.context.support.GenericApplicationContext:INFO {} 495] Refreshing org.springframework.context.support.GenericApplicationContext@10f46162: startup date [Tue Mar 05 21:23:51 GMT+08:00 2019]; root of context hierarchy
-[org.springframework.beans.factory.config.PropertyPlaceholderConfigurer:INFO {} 177] Loading properties file from class path resource [application.properties]
-[org.springframework.beans.factory.support.DefaultListableBeanFactory:INFO {} 557] Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@33bbcaf4: defining beans [mappings,samlInitializer,timeService,idService,velocityEngine,samlParserPool,decoder,bindingAdpater,securityPolicyResolver,securityPolicy,mapBasedStorageService,replayCache,messageReplayRule,issueInstantRule,signatureSecurityPolicyRule,keyStoreCredentialResolverDelegate,assertionConsumer,org.springframework.security.filterChains,org.springframework.security.filterChainProxy,org.springframework.security.web.PortMapperImpl#0,org.springframework.security.config.authentication.AuthenticationManagerFactoryBean#0,org.springframework.security.authentication.ProviderManager#0,org.springframework.security.web.context.HttpSessionSecurityContextRepository#0,org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy#0,org.springframework.security.web.savedrequest.HttpSessionRequestCache#0,org.springframework.security.access.vote.AffirmativeBased#0,org.springframework.security.web.access.intercept.FilterSecurityInterceptor#0,org.springframework.security.web.access.DefaultWebInvocationPrivilegeEvaluator#0,org.springframework.security.authentication.AnonymousAuthenticationProvider#0,org.springframework.security.userDetailsServiceFactory,org.springframework.security.web.DefaultSecurityFilterChain#0,org.springframework.security.authentication.DefaultAuthenticationEventPublisher#0,org.springframework.security.authenticationManager,samlAuthenticationProvider,authenticationFailureHandler,samlSolicitedFilter,samlAuthenticationEntryPoint,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,org.springframework.context.annotation.ConfigurationClassPostProcessor$ImportAwareBeanPostProcessor#0]; root of factory hierarchy
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 189] Preparing to load ValidatorSuites
-[org.opensaml.xml.XMLConfigurator:INFO {} 191] ValidatorSuites load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 180] Preparing to load ObjectProviders
-[org.opensaml.xml.XMLConfigurator:INFO {} 182] ObjectProviders load complete
-[org.opensaml.xml.XMLConfigurator:INFO {} 198] Preparing to load IDAttributes
-[org.opensaml.xml.XMLConfigurator:INFO {} 200] IDAttributes load complete
-[org.apache.velocity.app.VelocityEngine:INFO {} 49] LogSystem has been deprecated. Please use a LogChute implementation.
-[org.springframework.security.web.DefaultSecurityFilterChain:INFO {} 28] Creating filter chain: org.springframework.security.web.util.AnyRequestMatcher@1, [org.springframework.security.web.context.SecurityContextPersistenceFilter@603f2075, org.springframework.security.web.authentication.logout.LogoutFilter@65f979c6, com.connsec.spring.SAMLResponseAuthenticationProcessingFilter@4cddcb10, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@74ba18e8, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@6d1fb282, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@4386c1ae, org.springframework.security.web.session.SessionManagementFilter@61a11785, org.springframework.security.web.access.ExceptionTranslationFilter@45f83e01, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@55e31f9e]
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 38] end point service: {urn:oasis:names:tc:SAML:2.0:metadata}SingleSignOnService
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 39] end point location: http://login.connsec.com/sec/authorize/saml20/ce8b08e9-b884-4d1f-a795-01ae25f63d48
-[com.connsec.saml.xml.EndpointGenerator:DEBUG {} 40] end point responseLocation: http://saml.connsec.com/saml2sp/index
-[com.connsec.spring.SAMLAuthenticationEntryPoint:DEBUG {} 114] Sending authnRequest to http://login.connsec.com/sec/authorize/saml20/ce8b08e9-b884-4d1f-a795-01ae25f63d48
-[com.connsec.spring.SAMLAuthenticationEntryPointIntTest:DEBUG {} 82] The response was:
-
-
-
-
-
- Note: Since your browser does not support JavaScript,
- you must press the Continue button once to proceed.
-
-
-
-
-
-
-
-]]>
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.SAMLAuthenticationEntryPointTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.SAMLAuthenticationEntryPointTest.xml
deleted file mode 100644
index 457d1b2df..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.SAMLAuthenticationEntryPointTest.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.SAMLResponseAuthenticationProviderTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.SAMLResponseAuthenticationProviderTest.xml
deleted file mode 100644
index 98c5b0cef..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.SAMLResponseAuthenticationProviderTest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.UserTest.xml b/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.UserTest.xml
deleted file mode 100644
index 6df3bb9c5..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/test-results/test/TEST-com.connsec.spring.UserTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/binary/output.bin b/maxkey-demos/maxkey-demo-saml/build/test-results/test/binary/output.bin
deleted file mode 100644
index ba1416731..000000000
Binary files a/maxkey-demos/maxkey-demo-saml/build/test-results/test/binary/output.bin and /dev/null differ
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/binary/output.bin.idx b/maxkey-demos/maxkey-demo-saml/build/test-results/test/binary/output.bin.idx
deleted file mode 100644
index cf1ad5d3b..000000000
Binary files a/maxkey-demos/maxkey-demo-saml/build/test-results/test/binary/output.bin.idx and /dev/null differ
diff --git a/maxkey-demos/maxkey-demo-saml/build/test-results/test/binary/results.bin b/maxkey-demos/maxkey-demo-saml/build/test-results/test/binary/results.bin
deleted file mode 100644
index b4a2da7aa..000000000
Binary files a/maxkey-demos/maxkey-demo-saml/build/test-results/test/binary/results.bin and /dev/null differ
diff --git a/maxkey-demos/maxkey-demo-saml/build/tmp/test/jar_extract_4791209664707803879_tmp b/maxkey-demos/maxkey-demo-saml/build/tmp/test/jar_extract_4791209664707803879_tmp
deleted file mode 100644
index 305b7a20d..000000000
Binary files a/maxkey-demos/maxkey-demo-saml/build/tmp/test/jar_extract_4791209664707803879_tmp and /dev/null differ
diff --git a/maxkey-demos/maxkey-demo-saml/build/tmp/war/MANIFEST.MF b/maxkey-demos/maxkey-demo-saml/build/tmp/war/MANIFEST.MF
deleted file mode 100644
index 59499bce4..000000000
--- a/maxkey-demos/maxkey-demo-saml/build/tmp/war/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/maxkey-demos/maxkey-demo-tokenbase/.classpath b/maxkey-demos/maxkey-demo-tokenbase/.classpath
index 394f57b8c..708b1a19b 100644
--- a/maxkey-demos/maxkey-demo-tokenbase/.classpath
+++ b/maxkey-demos/maxkey-demo-tokenbase/.classpath
@@ -1,6 +1,11 @@
-
+
+
+
@@ -8,5 +13,5 @@
-
diff --git a/maxkey-demos/maxkey-demo-tokenbase/.project b/maxkey-demos/maxkey-demo-tokenbase/.project
index 839efaa34..63f7b2487 100644
--- a/maxkey-demos/maxkey-demo-tokenbase/.project
+++ b/maxkey-demos/maxkey-demo-tokenbase/.project
@@ -1,7 +1,7 @@
maxkey-demo-tokenbase
- Project maxkey-demo-tokenbase created by Buildship.
+ maxkey-demo-tokenbase
@@ -27,10 +27,10 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-demos/maxkey-demo-tokenbase/.settings/org.eclipse.jdt.core.prefs b/maxkey-demos/maxkey-demo-tokenbase/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-demos/maxkey-demo-tokenbase/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-demos/maxkey-demo-tokenbase/.settings/org.eclipse.wst.common.component b/maxkey-demos/maxkey-demo-tokenbase/.settings/org.eclipse.wst.common.component
index c879d1c31..ba97f1dbd 100644
--- a/maxkey-demos/maxkey-demo-tokenbase/.settings/org.eclipse.wst.common.component
+++ b/maxkey-demos/maxkey-demo-tokenbase/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
-
+
+
+
diff --git a/maxkey-jose-jwt/.project b/maxkey-jose-jwt/.project
index d5fecc397..c435a63c3 100644
--- a/maxkey-jose-jwt/.project
+++ b/maxkey-jose-jwt/.project
@@ -1,7 +1,7 @@
maxkey-jose-jwt
- Project maxkey-jose-jwt created by Buildship.
+ maxkey-jose-jwt
@@ -27,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-jose-jwt/.settings/org.eclipse.jdt.core.prefs b/maxkey-jose-jwt/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-jose-jwt/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-jose-jwt/build.gradle b/maxkey-jose-jwt/build.gradle
index eeb1a1f7e..68907debb 100644
--- a/maxkey-jose-jwt/build.gradle
+++ b/maxkey-jose-jwt/build.gradle
@@ -1,9 +1,7 @@
description = "maxkey-jose-jwt"
dependencies {
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/', include: '*/tink-1.2.2.jar')
+ compile fileTree(dir: '../maxkey-lib/', include: '*/bcp*jdk15on-150.jar')
+ compile fileTree(dir: '../maxkey-lib/', include: '*/asm-5.0.3.jar')
}
diff --git a/maxkey-jose-jwt/src/main/java/META-INF/MANIFEST.MF b/maxkey-jose-jwt/src/main/java/META-INF/MANIFEST.MF
index d4cc1df5e..d1156468e 100644
--- a/maxkey-jose-jwt/src/main/java/META-INF/MANIFEST.MF
+++ b/maxkey-jose-jwt/src/main/java/META-INF/MANIFEST.MF
@@ -3,13 +3,3 @@ Archiver-Version: Plexus Archiver
Created-By: Apache Maven
Built-By: vd
Build-Jdk: 1.7.0_72
-
-net.minidev
- json-smart-2.3
- asm-1.0.2
-
-Java Concurrency in Practice
- net.jcip.annotations
-
-nimbus
- nimbus-jose-jwt version 7.1
\ No newline at end of file
diff --git a/maxkey-jose-jwt/src/main/java/META-INF/README b/maxkey-jose-jwt/src/main/java/META-INF/README
new file mode 100644
index 000000000..e601056bb
--- /dev/null
+++ b/maxkey-jose-jwt/src/main/java/META-INF/README
@@ -0,0 +1,10 @@
+
+net.minidev
+ json-smart-2.3
+ asm-1.0.2
+
+Java Concurrency in Practice
+ net.jcip.annotations
+
+nimbus
+ nimbus-jose-jwt version 7.1
\ No newline at end of file
diff --git a/maxkey-lib/db/c3p0-0.9.2.1.jar b/maxkey-lib/db/c3p0-0.9.2.1.jar
deleted file mode 100644
index 10ec0dc72..000000000
Binary files a/maxkey-lib/db/c3p0-0.9.2.1.jar and /dev/null differ
diff --git a/maxkey-lib/db/c3p0-0.9.5.4.jar b/maxkey-lib/db/c3p0-0.9.5.4.jar
new file mode 100644
index 000000000..a71b46886
Binary files /dev/null and b/maxkey-lib/db/c3p0-0.9.5.4.jar differ
diff --git a/maxkey-lib/db/mchange-commons-java-0.2.15.jar b/maxkey-lib/db/mchange-commons-java-0.2.15.jar
new file mode 100644
index 000000000..4954089cd
Binary files /dev/null and b/maxkey-lib/db/mchange-commons-java-0.2.15.jar differ
diff --git a/maxkey-lib/db/mchange-commons-java-0.2.3.3.jar b/maxkey-lib/db/mchange-commons-java-0.2.3.3.jar
deleted file mode 100644
index c44160e2b..000000000
Binary files a/maxkey-lib/db/mchange-commons-java-0.2.3.3.jar and /dev/null differ
diff --git a/maxkey-lib/db/mybatis-3.3.0.jar b/maxkey-lib/db/mybatis-3.3.0.jar
deleted file mode 100644
index 1cc5f4e8b..000000000
Binary files a/maxkey-lib/db/mybatis-3.3.0.jar and /dev/null differ
diff --git a/maxkey-lib/db/mybatis-3.4.6.jar b/maxkey-lib/db/mybatis-3.4.6.jar
new file mode 100644
index 000000000..ae6aae8db
Binary files /dev/null and b/maxkey-lib/db/mybatis-3.4.6.jar differ
diff --git a/maxkey-lib/db/mybatis-spring-1.2.3.jar b/maxkey-lib/db/mybatis-spring-1.2.3.jar
deleted file mode 100644
index 7ddda85a0..000000000
Binary files a/maxkey-lib/db/mybatis-spring-1.2.3.jar and /dev/null differ
diff --git a/maxkey-lib/db/mybatis-spring-1.3.2.jar b/maxkey-lib/db/mybatis-spring-1.3.2.jar
new file mode 100644
index 000000000..a69335fcf
Binary files /dev/null and b/maxkey-lib/db/mybatis-spring-1.3.2.jar differ
diff --git a/maxkey-lib/json/jackson-annotations-2.8.4.jar b/maxkey-lib/json/jackson-annotations-2.8.4.jar
deleted file mode 100644
index 583dff27e..000000000
Binary files a/maxkey-lib/json/jackson-annotations-2.8.4.jar and /dev/null differ
diff --git a/maxkey-lib/json/jackson-annotations-2.9.8.jar b/maxkey-lib/json/jackson-annotations-2.9.8.jar
new file mode 100644
index 000000000..4d9f42153
Binary files /dev/null and b/maxkey-lib/json/jackson-annotations-2.9.8.jar differ
diff --git a/maxkey-lib/json/jackson-core-2.8.4.jar b/maxkey-lib/json/jackson-core-2.8.4.jar
deleted file mode 100644
index 352bd5dbf..000000000
Binary files a/maxkey-lib/json/jackson-core-2.8.4.jar and /dev/null differ
diff --git a/maxkey-lib/json/jackson-core-2.9.8.jar b/maxkey-lib/json/jackson-core-2.9.8.jar
new file mode 100644
index 000000000..362f1f393
Binary files /dev/null and b/maxkey-lib/json/jackson-core-2.9.8.jar differ
diff --git a/maxkey-lib/json/jackson-databind-2.8.4.jar b/maxkey-lib/json/jackson-databind-2.8.4.jar
deleted file mode 100644
index 37a0b2c4a..000000000
Binary files a/maxkey-lib/json/jackson-databind-2.8.4.jar and /dev/null differ
diff --git a/maxkey-lib/json/jackson-databind-2.9.8.jar b/maxkey-lib/json/jackson-databind-2.9.8.jar
new file mode 100644
index 000000000..2d8687b5d
Binary files /dev/null and b/maxkey-lib/json/jackson-databind-2.9.8.jar differ
diff --git a/maxkey-lib/log/jul-to-slf4j-1.7.7.jar b/maxkey-lib/log/jul-to-slf4j-1.7.7.jar
deleted file mode 100644
index c26621adf..000000000
Binary files a/maxkey-lib/log/jul-to-slf4j-1.7.7.jar and /dev/null differ
diff --git a/maxkey-lib/log/log4j-1.2-api-2.9.0.jar b/maxkey-lib/log/log4j-1.2-api-2.9.0.jar
new file mode 100644
index 000000000..64d48661c
Binary files /dev/null and b/maxkey-lib/log/log4j-1.2-api-2.9.0.jar differ
diff --git a/maxkey-lib/log/log4j-1.2.17.jar b/maxkey-lib/log/log4j-1.2.17.jar
deleted file mode 100644
index 1d425cf7d..000000000
Binary files a/maxkey-lib/log/log4j-1.2.17.jar and /dev/null differ
diff --git a/maxkey-lib/log/log4j-api-2.9.0.jar b/maxkey-lib/log/log4j-api-2.9.0.jar
new file mode 100644
index 000000000..04f44398e
Binary files /dev/null and b/maxkey-lib/log/log4j-api-2.9.0.jar differ
diff --git a/maxkey-lib/log/log4j-core-2.9.0.jar b/maxkey-lib/log/log4j-core-2.9.0.jar
new file mode 100644
index 000000000..7a94c74d4
Binary files /dev/null and b/maxkey-lib/log/log4j-core-2.9.0.jar differ
diff --git a/maxkey-lib/log/log4j-jcl-2.9.0.jar b/maxkey-lib/log/log4j-jcl-2.9.0.jar
new file mode 100644
index 000000000..271181ef2
Binary files /dev/null and b/maxkey-lib/log/log4j-jcl-2.9.0.jar differ
diff --git a/maxkey-lib/log/log4j-jul-2.9.0.jar b/maxkey-lib/log/log4j-jul-2.9.0.jar
new file mode 100644
index 000000000..3096b11ee
Binary files /dev/null and b/maxkey-lib/log/log4j-jul-2.9.0.jar differ
diff --git a/maxkey-lib/log/log4j-slf4j-impl-2.9.0.jar b/maxkey-lib/log/log4j-slf4j-impl-2.9.0.jar
new file mode 100644
index 000000000..6249f6e0d
Binary files /dev/null and b/maxkey-lib/log/log4j-slf4j-impl-2.9.0.jar differ
diff --git a/maxkey-lib/log/log4j-web-2.9.0.jar b/maxkey-lib/log/log4j-web-2.9.0.jar
new file mode 100644
index 000000000..939d76493
Binary files /dev/null and b/maxkey-lib/log/log4j-web-2.9.0.jar differ
diff --git a/maxkey-lib/log/slf4j-api-1.7.25.jar b/maxkey-lib/log/slf4j-api-1.7.25.jar
new file mode 100644
index 000000000..7e62f1336
Binary files /dev/null and b/maxkey-lib/log/slf4j-api-1.7.25.jar differ
diff --git a/maxkey-lib/log/slf4j-api-1.7.7.jar b/maxkey-lib/log/slf4j-api-1.7.7.jar
deleted file mode 100644
index b28e220b7..000000000
Binary files a/maxkey-lib/log/slf4j-api-1.7.7.jar and /dev/null differ
diff --git a/maxkey-lib/log/slf4j-log4j12-1.7.7.jar b/maxkey-lib/log/slf4j-log4j12-1.7.7.jar
deleted file mode 100644
index 12c804ebd..000000000
Binary files a/maxkey-lib/log/slf4j-log4j12-1.7.7.jar and /dev/null differ
diff --git a/maxkey-lib/log/slf4j-nop-1.7.7.jar b/maxkey-lib/log/slf4j-nop-1.7.7.jar
deleted file mode 100644
index d73cb9b0f..000000000
Binary files a/maxkey-lib/log/slf4j-nop-1.7.7.jar and /dev/null differ
diff --git a/maxkey-protocols/.classpath b/maxkey-protocols/.classpath
index 8d8d85f14..eb19361b5 100644
--- a/maxkey-protocols/.classpath
+++ b/maxkey-protocols/.classpath
@@ -2,5 +2,5 @@
diff --git a/maxkey-protocols/.project b/maxkey-protocols/.project
index 75326595b..6711488a9 100644
--- a/maxkey-protocols/.project
+++ b/maxkey-protocols/.project
@@ -1,7 +1,7 @@
maxkey-protocols
- Project maxkey-protocols created by Buildship.
+
@@ -17,7 +17,7 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-protocols/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-protocols/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-protocols/maxkey-protocol-authorize/.classpath b/maxkey-protocols/maxkey-protocol-authorize/.classpath
index 0b72ca4b5..4857be400 100644
--- a/maxkey-protocols/maxkey-protocol-authorize/.classpath
+++ b/maxkey-protocols/maxkey-protocol-authorize/.classpath
@@ -1,7 +1,12 @@
-
+
+
+
diff --git a/maxkey-protocols/maxkey-protocol-authorize/.project b/maxkey-protocols/maxkey-protocol-authorize/.project
index 72ea5c260..b1dca27c2 100644
--- a/maxkey-protocols/maxkey-protocol-authorize/.project
+++ b/maxkey-protocols/maxkey-protocol-authorize/.project
@@ -1,7 +1,7 @@
maxkey-protocol-authorize
- Project maxkey-protocol-authorize created by Buildship.
+ maxkey-protocol-authorize
@@ -20,11 +20,6 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
org.eclipse.wst.validation.validationbuilder
@@ -32,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-protocols/maxkey-protocol-authorize/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/maxkey-protocol-authorize/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-protocols/maxkey-protocol-authorize/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-protocols/maxkey-protocol-authorize/bin/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-authorize/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-authorize/bin/META-INF/MANIFEST.MF
rename to maxkey-protocols/maxkey-protocol-authorize/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-protocols/maxkey-protocol-authorize/build.gradle b/maxkey-protocols/maxkey-protocol-authorize/build.gradle
index 29c94b50c..30d89f65e 100644
--- a/maxkey-protocols/maxkey-protocol-authorize/build.gradle
+++ b/maxkey-protocols/maxkey-protocol-authorize/build.gradle
@@ -4,18 +4,7 @@ description = "maxkey-protocol-authorize"
dependencies {
//local jars
- compile fileTree(dir: '../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/spring-security/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/tiles/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
compile project(":maxkey-core")
compile project(":maxkey-dao")
diff --git a/maxkey-protocols/maxkey-protocol-authorize/build/libs/maxkey-protocol-authorize-3.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-authorize/build/libs/maxkey-protocol-authorize-3.0.0.RELEASE.jar
deleted file mode 100644
index e6f22e7e4..000000000
Binary files a/maxkey-protocols/maxkey-protocol-authorize/build/libs/maxkey-protocol-authorize-3.0.0.RELEASE.jar and /dev/null differ
diff --git a/maxkey-protocols/maxkey-protocol-authorize/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-authorize/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index 286b6b193..000000000
--- a/maxkey-protocols/maxkey-protocol-authorize/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Title: maxkey-protocol-authorize
-Implementation-Version: 3.0.0.RELEASE
-Implementation-Date: 2019-03-05T21:26:16.761+08:00[GMT+08:00]
-Created-By: com.connsec.maxkey
-Implementation-Vendor: http://www.connsec.com
-
diff --git a/maxkey-protocols/maxkey-protocol-cas/.classpath b/maxkey-protocols/maxkey-protocol-cas/.classpath
index 26e610cbe..b79fc0c54 100644
--- a/maxkey-protocols/maxkey-protocol-cas/.classpath
+++ b/maxkey-protocols/maxkey-protocol-cas/.classpath
@@ -1,8 +1,18 @@
-
+
+
+
+
+
+
+
diff --git a/maxkey-protocols/maxkey-protocol-cas/.project b/maxkey-protocols/maxkey-protocol-cas/.project
index a2a29d9b0..d64b08759 100644
--- a/maxkey-protocols/maxkey-protocol-cas/.project
+++ b/maxkey-protocols/maxkey-protocol-cas/.project
@@ -1,7 +1,7 @@
maxkey-protocol-cas
- Project maxkey-protocol-cas created by Buildship.
+ maxkey-protocol-cas
@@ -20,11 +20,6 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
org.eclipse.wst.validation.validationbuilder
@@ -32,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-protocols/maxkey-protocol-cas/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/maxkey-protocol-cas/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-protocols/maxkey-protocol-cas/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-protocols/maxkey-protocol-cas/bin/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-cas/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-cas/bin/META-INF/MANIFEST.MF
rename to maxkey-protocols/maxkey-protocol-cas/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-protocols/maxkey-protocol-cas/build.gradle b/maxkey-protocols/maxkey-protocol-cas/build.gradle
index 127b15a39..65a23b5db 100644
--- a/maxkey-protocols/maxkey-protocol-cas/build.gradle
+++ b/maxkey-protocols/maxkey-protocol-cas/build.gradle
@@ -4,18 +4,7 @@ description = "maxkey-protocol-cas"
dependencies {
//local jars
- compile fileTree(dir: '../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/spring-security/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/tiles/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
compile project(":maxkey-core")
compile project(":maxkey-dao")
diff --git a/maxkey-protocols/maxkey-protocol-cas/build/libs/maxkey-protocol-cas-3.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-cas/build/libs/maxkey-protocol-cas-3.0.0.RELEASE.jar
deleted file mode 100644
index 53858f335..000000000
Binary files a/maxkey-protocols/maxkey-protocol-cas/build/libs/maxkey-protocol-cas-3.0.0.RELEASE.jar and /dev/null differ
diff --git a/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/css/base-style.css b/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/css/base-style.css
deleted file mode 100644
index 4afa73e3d..000000000
--- a/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/css/base-style.css
+++ /dev/null
@@ -1,179 +0,0 @@
-
-body {
- margin: 0;
- padding: 0;
- font-family: sans-serif;
- font-size: 12pt;
-}
-
-body, a, a:visited {
- color: #303030;
-}
-
-#content {
- padding-left: 50px;
- padding-right: 50px;
- padding-top: 30px;
- padding-bottom: 30px;
-}
-
-#content h1 {
- font-size: 160%;
- margin-bottom: 10px;
-}
-
-#footer {
- margin-top: 100px;
- font-size: 80%;
- white-space: nowrap;
-}
-
-#footer, #footer a {
- color: #a0a0a0;
-}
-
-#line-wrapping-toggle {
- vertical-align: middle;
-}
-
-#label-for-line-wrapping-toggle {
- vertical-align: middle;
-}
-
-ul {
- margin-left: 0;
-}
-
-h1, h2, h3 {
- white-space: nowrap;
-}
-
-h2 {
- font-size: 120%;
-}
-
-ul.tabLinks {
- padding-left: 0;
- padding-top: 10px;
- padding-bottom: 10px;
- overflow: auto;
- min-width: 800px;
- width: auto !important;
- width: 800px;
-}
-
-ul.tabLinks li {
- float: left;
- height: 100%;
- list-style: none;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
- margin-bottom: 0;
- -moz-border-radius: 7px;
- border-radius: 7px;
- margin-right: 25px;
- border: solid 1px #d4d4d4;
- background-color: #f0f0f0;
-}
-
-ul.tabLinks li:hover {
- background-color: #fafafa;
-}
-
-ul.tabLinks li.selected {
- background-color: #c5f0f5;
- border-color: #c5f0f5;
-}
-
-ul.tabLinks a {
- font-size: 120%;
- display: block;
- outline: none;
- text-decoration: none;
- margin: 0;
- padding: 0;
-}
-
-ul.tabLinks li h2 {
- margin: 0;
- padding: 0;
-}
-
-div.tab {
-}
-
-div.selected {
- display: block;
-}
-
-div.deselected {
- display: none;
-}
-
-div.tab table {
- min-width: 350px;
- width: auto !important;
- width: 350px;
- border-collapse: collapse;
-}
-
-div.tab th, div.tab table {
- border-bottom: solid #d0d0d0 1px;
-}
-
-div.tab th {
- text-align: left;
- white-space: nowrap;
- padding-left: 6em;
-}
-
-div.tab th:first-child {
- padding-left: 0;
-}
-
-div.tab td {
- white-space: nowrap;
- padding-left: 6em;
- padding-top: 5px;
- padding-bottom: 5px;
-}
-
-div.tab td:first-child {
- padding-left: 0;
-}
-
-div.tab td.numeric, div.tab th.numeric {
- text-align: right;
-}
-
-span.code {
- display: inline-block;
- margin-top: 0em;
- margin-bottom: 1em;
-}
-
-span.code pre {
- font-size: 11pt;
- padding-top: 10px;
- padding-bottom: 10px;
- padding-left: 10px;
- padding-right: 10px;
- margin: 0;
- background-color: #f7f7f7;
- border: solid 1px #d0d0d0;
- min-width: 700px;
- width: auto !important;
- width: 700px;
-}
-
-span.wrapped pre {
- word-wrap: break-word;
- white-space: pre-wrap;
- word-break: break-all;
-}
-
-label.hidden {
- display: none;
-}
\ No newline at end of file
diff --git a/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/css/style.css b/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/css/style.css
deleted file mode 100644
index 3dc4913e7..000000000
--- a/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/css/style.css
+++ /dev/null
@@ -1,84 +0,0 @@
-
-#summary {
- margin-top: 30px;
- margin-bottom: 40px;
-}
-
-#summary table {
- border-collapse: collapse;
-}
-
-#summary td {
- vertical-align: top;
-}
-
-.breadcrumbs, .breadcrumbs a {
- color: #606060;
-}
-
-.infoBox {
- width: 110px;
- padding-top: 15px;
- padding-bottom: 15px;
- text-align: center;
-}
-
-.infoBox p {
- margin: 0;
-}
-
-.counter, .percent {
- font-size: 120%;
- font-weight: bold;
- margin-bottom: 8px;
-}
-
-#duration {
- width: 125px;
-}
-
-#successRate, .summaryGroup {
- border: solid 2px #d0d0d0;
- -moz-border-radius: 10px;
- border-radius: 10px;
-}
-
-#successRate {
- width: 140px;
- margin-left: 35px;
-}
-
-#successRate .percent {
- font-size: 180%;
-}
-
-.success, .success a {
- color: #008000;
-}
-
-div.success, #successRate.success {
- background-color: #bbd9bb;
- border-color: #008000;
-}
-
-.failures, .failures a {
- color: #b60808;
-}
-
-.skipped, .skipped a {
- color: #c09853;
-}
-
-div.failures, #successRate.failures {
- background-color: #ecdada;
- border-color: #b60808;
-}
-
-ul.linkList {
- padding-left: 0;
-}
-
-ul.linkList li {
- list-style: none;
- margin-bottom: 5px;
-}
diff --git a/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/index.html b/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/index.html
deleted file mode 100644
index 19e16cab7..000000000
--- a/maxkey-protocols/maxkey-protocol-cas/build/reports/tests/test/index.html
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-Test results - Test Summary
-
-
Test Summary
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Classes
-
-
-
-Class
-Tests
-Failures
-Ignored
-Duration
-Success rate
-
-
-
-
-
-
-
-
+
+
+
diff --git a/maxkey-protocols/maxkey-protocol-desktop/.project b/maxkey-protocols/maxkey-protocol-desktop/.project
index a412984af..659f99769 100644
--- a/maxkey-protocols/maxkey-protocol-desktop/.project
+++ b/maxkey-protocols/maxkey-protocol-desktop/.project
@@ -1,7 +1,7 @@
maxkey-protocol-desktop
- Project maxkey-protocol-desktop created by Buildship.
+ maxkey-protocol-desktop
@@ -20,11 +20,6 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
org.eclipse.wst.validation.validationbuilder
@@ -32,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-protocols/maxkey-protocol-desktop/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/maxkey-protocol-desktop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-protocols/maxkey-protocol-desktop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-protocols/maxkey-protocol-desktop/bin/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-desktop/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-desktop/bin/META-INF/MANIFEST.MF
rename to maxkey-protocols/maxkey-protocol-desktop/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-protocols/maxkey-protocol-desktop/build.gradle b/maxkey-protocols/maxkey-protocol-desktop/build.gradle
index ac0ab8dda..a2b3e5c94 100644
--- a/maxkey-protocols/maxkey-protocol-desktop/build.gradle
+++ b/maxkey-protocols/maxkey-protocol-desktop/build.gradle
@@ -4,18 +4,7 @@ description = "maxkey-protocol-desktop"
dependencies {
//local jars
- compile fileTree(dir: '../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/spring-security/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/tiles/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
compile project(":maxkey-core")
compile project(":maxkey-dao")
diff --git a/maxkey-protocols/maxkey-protocol-desktop/build/libs/maxkey-protocol-desktop-3.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-desktop/build/libs/maxkey-protocol-desktop-3.0.0.RELEASE.jar
deleted file mode 100644
index 3227351b1..000000000
Binary files a/maxkey-protocols/maxkey-protocol-desktop/build/libs/maxkey-protocol-desktop-3.0.0.RELEASE.jar and /dev/null differ
diff --git a/maxkey-protocols/maxkey-protocol-desktop/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-desktop/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index 2fdd4ae6b..000000000
--- a/maxkey-protocols/maxkey-protocol-desktop/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Title: maxkey-protocol-desktop
-Implementation-Version: 3.0.0.RELEASE
-Implementation-Date: 2019-03-05T21:26:16.767+08:00[GMT+08:00]
-Created-By: com.connsec.maxkey
-Implementation-Vendor: http://www.connsec.com
-
diff --git a/maxkey-protocols/maxkey-protocol-extendapi/.classpath b/maxkey-protocols/maxkey-protocol-extendapi/.classpath
index 0b72ca4b5..4857be400 100644
--- a/maxkey-protocols/maxkey-protocol-extendapi/.classpath
+++ b/maxkey-protocols/maxkey-protocol-extendapi/.classpath
@@ -1,7 +1,12 @@
-
+
+
+
diff --git a/maxkey-protocols/maxkey-protocol-extendapi/.project b/maxkey-protocols/maxkey-protocol-extendapi/.project
index 956f606de..d6838763f 100644
--- a/maxkey-protocols/maxkey-protocol-extendapi/.project
+++ b/maxkey-protocols/maxkey-protocol-extendapi/.project
@@ -1,7 +1,7 @@
maxkey-protocol-extendapi
- Project maxkey-protocol-extendapi created by Buildship.
+ maxkey-protocol-extendapi
@@ -20,11 +20,6 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
org.eclipse.wst.validation.validationbuilder
@@ -32,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-protocols/maxkey-protocol-extendapi/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/maxkey-protocol-extendapi/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-protocols/maxkey-protocol-extendapi/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-protocols/maxkey-protocol-extendapi/bin/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-extendapi/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-extendapi/bin/META-INF/MANIFEST.MF
rename to maxkey-protocols/maxkey-protocol-extendapi/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-protocols/maxkey-protocol-extendapi/build.gradle b/maxkey-protocols/maxkey-protocol-extendapi/build.gradle
index bf9712a24..78cc14148 100644
--- a/maxkey-protocols/maxkey-protocol-extendapi/build.gradle
+++ b/maxkey-protocols/maxkey-protocol-extendapi/build.gradle
@@ -4,18 +4,7 @@ description = "maxkey-protocol-extendapi"
dependencies {
//local jars
- compile fileTree(dir: '../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/spring-security/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/tiles/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
compile project(":maxkey-core")
compile project(":maxkey-dao")
diff --git a/maxkey-protocols/maxkey-protocol-extendapi/build/libs/maxkey-protocol-extendapi-3.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-extendapi/build/libs/maxkey-protocol-extendapi-3.0.0.RELEASE.jar
deleted file mode 100644
index 356479817..000000000
Binary files a/maxkey-protocols/maxkey-protocol-extendapi/build/libs/maxkey-protocol-extendapi-3.0.0.RELEASE.jar and /dev/null differ
diff --git a/maxkey-protocols/maxkey-protocol-extendapi/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-extendapi/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index ae527d13c..000000000
--- a/maxkey-protocols/maxkey-protocol-extendapi/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Title: maxkey-protocol-extendapi
-Implementation-Version: 3.0.0.RELEASE
-Implementation-Date: 2019-03-05T21:26:16.770+08:00[GMT+08:00]
-Created-By: com.connsec.maxkey
-Implementation-Vendor: http://www.connsec.com
-
diff --git a/maxkey-protocols/maxkey-protocol-formbased/.classpath b/maxkey-protocols/maxkey-protocol-formbased/.classpath
index 0b72ca4b5..4857be400 100644
--- a/maxkey-protocols/maxkey-protocol-formbased/.classpath
+++ b/maxkey-protocols/maxkey-protocol-formbased/.classpath
@@ -1,7 +1,12 @@
-
+
+
+
diff --git a/maxkey-protocols/maxkey-protocol-formbased/.project b/maxkey-protocols/maxkey-protocol-formbased/.project
index ac3d88ac5..282be6ff4 100644
--- a/maxkey-protocols/maxkey-protocol-formbased/.project
+++ b/maxkey-protocols/maxkey-protocol-formbased/.project
@@ -1,7 +1,7 @@
maxkey-protocol-formbased
- Project maxkey-protocol-formbased created by Buildship.
+ maxkey-protocol-formbased
@@ -20,11 +20,6 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
org.eclipse.wst.validation.validationbuilder
@@ -32,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-protocols/maxkey-protocol-formbased/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/maxkey-protocol-formbased/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-protocols/maxkey-protocol-formbased/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-protocols/maxkey-protocol-formbased/bin/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-formbased/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-formbased/bin/META-INF/MANIFEST.MF
rename to maxkey-protocols/maxkey-protocol-formbased/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-protocols/maxkey-protocol-formbased/build.gradle b/maxkey-protocols/maxkey-protocol-formbased/build.gradle
index bb46edbdc..33911c380 100644
--- a/maxkey-protocols/maxkey-protocol-formbased/build.gradle
+++ b/maxkey-protocols/maxkey-protocol-formbased/build.gradle
@@ -4,18 +4,7 @@ description = "maxkey-protocol-formbased"
dependencies {
//local jars
- compile fileTree(dir: '../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/spring-security/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/tiles/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
compile project(":maxkey-core")
compile project(":maxkey-dao")
diff --git a/maxkey-protocols/maxkey-protocol-formbased/build/libs/maxkey-protocol-formbased-3.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-formbased/build/libs/maxkey-protocol-formbased-3.0.0.RELEASE.jar
deleted file mode 100644
index ca5015279..000000000
Binary files a/maxkey-protocols/maxkey-protocol-formbased/build/libs/maxkey-protocol-formbased-3.0.0.RELEASE.jar and /dev/null differ
diff --git a/maxkey-protocols/maxkey-protocol-formbased/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-formbased/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index fb502a72c..000000000
--- a/maxkey-protocols/maxkey-protocol-formbased/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Title: maxkey-protocol-formbased
-Implementation-Version: 3.0.0.RELEASE
-Implementation-Date: 2019-03-05T21:26:16.786+08:00[GMT+08:00]
-Created-By: com.connsec.maxkey
-Implementation-Vendor: http://www.connsec.com
-
diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java
index 176cfbbed..606c37600 100644
--- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java
+++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java
@@ -1,13 +1,13 @@
/**
*
*/
-package org.maxkey.authz.form.endpoint;
+package org.maxkey.authz.formbased.endpoint;
import javax.servlet.http.HttpServletRequest;
import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint;
import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
-import org.maxkey.authz.form.endpoint.adapter.FormBasedDefaultAdapter;
+import org.maxkey.authz.formbased.endpoint.adapter.FormBasedDefaultAdapter;
import org.maxkey.constants.BOOLEAN;
import org.maxkey.dao.service.FormBasedDetailsService;
import org.maxkey.domain.Accounts;
diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java
index 577b84fc2..f51edaa9f 100644
--- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java
+++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java
@@ -1,4 +1,4 @@
-package org.maxkey.authz.form.endpoint.adapter;
+package org.maxkey.authz.formbased.endpoint.adapter;
import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
import org.maxkey.constants.BOOLEAN;
diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java
index 441c83b2b..c6deeb113 100644
--- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java
+++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java
@@ -1,4 +1,4 @@
-package org.maxkey.authz.form.endpoint.adapter;
+package org.maxkey.authz.formbased.endpoint.adapter;
import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
import org.maxkey.constants.BOOLEAN;
diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java
index 020811919..97b2fb17b 100644
--- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java
+++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java
@@ -1,4 +1,4 @@
-package org.maxkey.authz.form.endpoint.adapter;
+package org.maxkey.authz.formbased.endpoint.adapter;
import java.util.Date;
diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java
index fc38092ee..1530e3d6e 100644
--- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java
+++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java
@@ -1,4 +1,4 @@
-package org.maxkey.authz.form.endpoint.adapter;
+package org.maxkey.authz.formbased.endpoint.adapter;
import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
import org.maxkey.constants.BOOLEAN;
diff --git a/maxkey-protocols/maxkey-protocol-ltpa/.classpath b/maxkey-protocols/maxkey-protocol-ltpa/.classpath
index 0b72ca4b5..4857be400 100644
--- a/maxkey-protocols/maxkey-protocol-ltpa/.classpath
+++ b/maxkey-protocols/maxkey-protocol-ltpa/.classpath
@@ -1,7 +1,12 @@
-
+
+
+
diff --git a/maxkey-protocols/maxkey-protocol-ltpa/.project b/maxkey-protocols/maxkey-protocol-ltpa/.project
index ba791847c..32c214e9a 100644
--- a/maxkey-protocols/maxkey-protocol-ltpa/.project
+++ b/maxkey-protocols/maxkey-protocol-ltpa/.project
@@ -1,7 +1,7 @@
maxkey-protocol-ltpa
- Project maxkey-protocol-ltpa created by Buildship.
+ maxkey-protocol-ltpa
@@ -20,11 +20,6 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
org.eclipse.wst.validation.validationbuilder
@@ -32,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-protocols/maxkey-protocol-ltpa/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-protocols/maxkey-protocol-ltpa/bin/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-ltpa/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-ltpa/bin/META-INF/MANIFEST.MF
rename to maxkey-protocols/maxkey-protocol-ltpa/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-protocols/maxkey-protocol-ltpa/build.gradle b/maxkey-protocols/maxkey-protocol-ltpa/build.gradle
index 47bdec13a..01a8d9f09 100644
--- a/maxkey-protocols/maxkey-protocol-ltpa/build.gradle
+++ b/maxkey-protocols/maxkey-protocol-ltpa/build.gradle
@@ -4,18 +4,7 @@ description = "maxkey-protocol-ltpa"
dependencies {
//local jars
- compile fileTree(dir: '../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/spring-security/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/tiles/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
compile project(":maxkey-core")
compile project(":maxkey-dao")
diff --git a/maxkey-protocols/maxkey-protocol-ltpa/build/libs/maxkey-protocol-ltpa-3.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-ltpa/build/libs/maxkey-protocol-ltpa-3.0.0.RELEASE.jar
deleted file mode 100644
index 1cc5c5142..000000000
Binary files a/maxkey-protocols/maxkey-protocol-ltpa/build/libs/maxkey-protocol-ltpa-3.0.0.RELEASE.jar and /dev/null differ
diff --git a/maxkey-protocols/maxkey-protocol-ltpa/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-ltpa/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index efab83196..000000000
--- a/maxkey-protocols/maxkey-protocol-ltpa/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Title: maxkey-protocol-ltpa
-Implementation-Version: 3.0.0.RELEASE
-Implementation-Date: 2019-03-05T21:26:16.796+08:00[GMT+08:00]
-Created-By: com.connsec.maxkey
-Implementation-Vendor: http://www.connsec.com
-
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/.classpath b/maxkey-protocols/maxkey-protocol-oauth-2.0/.classpath
index 32b3a1cf3..467ef2f2b 100644
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/.classpath
+++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/.classpath
@@ -1,8 +1,18 @@
-
+
+
+
+
+
+
+
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/.project b/maxkey-protocols/maxkey-protocol-oauth-2.0/.project
index 8cfc8a3a3..bb2522b2f 100644
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/.project
+++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/.project
@@ -1,7 +1,7 @@
maxkey-protocol-oauth-2.0
- Project maxkey-protocol-oauth-2.0 created by Buildship.
+ maxkey-protocol-oauth-2.0
@@ -20,11 +20,6 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
org.eclipse.wst.validation.validationbuilder
@@ -32,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/maxkey-protocol-oauth-2.0/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-oauth-2.0/bin/META-INF/MANIFEST.MF
rename to maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/META-INF/spring.handlers b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/spring.handlers
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-oauth-2.0/bin/META-INF/spring.handlers
rename to maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/spring.handlers
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/META-INF/spring.schemas b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/spring.schemas
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-oauth-2.0/bin/META-INF/spring.schemas
rename to maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/spring.schemas
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java.backup.20190420 b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java.backup.20190420
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-oauth-2.0/bin/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java.backup.20190420
rename to maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java.backup.20190420
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/org/springframework/security/oauth2/spring-security-oauth2-1.0.xsd b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/org/springframework/security/oauth2/spring-security-oauth2-1.0.xsd
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-oauth-2.0/bin/org/springframework/security/oauth2/spring-security-oauth2-1.0.xsd
rename to maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/org/springframework/security/oauth2/spring-security-oauth2-1.0.xsd
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle b/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle
index 993c1a2c7..f6d929917 100644
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle
+++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle
@@ -2,18 +2,7 @@ description = "maxkey-protocol-oauth-2.0"
dependencies {
//local jars
- compile fileTree(dir: '../../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/spring-security/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/tiles/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
compile project(":maxkey-core")
compile project(":maxkey-jose-jwt")
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/libs/maxkey-protocol-oauth-2.0-3.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-oauth-2.0/build/libs/maxkey-protocol-oauth-2.0-3.0.0.RELEASE.jar
deleted file mode 100644
index 6d859986f..000000000
Binary files a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/libs/maxkey-protocol-oauth-2.0-3.0.0.RELEASE.jar and /dev/null differ
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/META-INF/spring.handlers b/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/META-INF/spring.handlers
deleted file mode 100644
index c9bae2aa3..000000000
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/META-INF/spring.handlers
+++ /dev/null
@@ -1,2 +0,0 @@
-http\://www.springframework.org/schema/security/oauth2=org.springframework.security.oauth2.config.xml.OAuth2SecurityNamespaceHandler
-http\://www.springframework.org/schema/security/oauth=org.springframework.security.oauth.config.OAuthSecurityNamespaceHandler
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/META-INF/spring.schemas b/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/META-INF/spring.schemas
deleted file mode 100644
index af765299f..000000000
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/META-INF/spring.schemas
+++ /dev/null
@@ -1,5 +0,0 @@
-http\://www.springframework.org/schema/security/spring-security-oauth2-1.0.xsd=org/springframework/security/oauth2/spring-security-oauth2-1.0.xsd
-http\://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd=org/springframework/security/oauth2/spring-security-oauth2-2.0.xsd
-http\://www.springframework.org/schema/security/spring-security-oauth2.xsd=org/springframework/security/oauth2/spring-security-oauth2-2.0.xsd
-http\://www.springframework.org/schema/security/spring-security-oauth-1.0.xsd=org/springframework/security/oauth/spring-security-oauth-1.0.xsd
-http\://www.springframework.org/schema/security/spring-security-oauth.xsd=org/springframework/security/oauth/spring-security-oauth-1.0.xsd
\ No newline at end of file
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/org/springframework/security/oauth2/spring-security-oauth2-1.0.xsd b/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/org/springframework/security/oauth2/spring-security-oauth2-1.0.xsd
deleted file mode 100644
index 71007dd0b..000000000
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/org/springframework/security/oauth2/spring-security-oauth2-1.0.xsd
+++ /dev/null
@@ -1,728 +0,0 @@
-
-
-
-
-
-
- Creates an OAuth2RestTemplate with all the pieces needed to connect to a remote resource from
- a web
- application. Injects request and session-scoped beans into the template, so can only be
- used in the context of a web
- request.
-
-
-
-
-
-
-
-
-
-
-
-
- The OAuth2ProtectedResourceDetails governing the configuration of this client. Mandatory.
-
-
-
-
-
-
- The reference to the bean that manages access token acquisition. Optional (defaults to a chain
- including common grant types from the spec).
-
-
-
-
-
-
-
-
-
-
-
- Specifies that the oauth 2 authorization and token
- endpoints should be created in the application
- context. These are
- implemented as regular Spring @Controller beans, so as long as the
- default Spring MVC set up in
- present in the application
- the endpoints should work (at /oauth/authorization and /oauth/token by
- default).
-
-
-
-
-
-
-
-
- The configuration of the authorization code
- mechanism. This
- mechanism enables a way for clients to
- obtain an
- access token by obtaining an authorization code.
-
-
-
-
-
-
- Whether to disable the authorization code
- mechanism.
-
-
-
-
-
-
- The reference to the bean that defines the
- authorization code
- services. Default value is an
- instance of
- "org.springframework.security.oauth2.provider.authorization_code.InMemoryAuthorizationCodeServices".
-
-
-
-
-
-
-
-
- The configuration of the client credentials
- grant type.
-
-
-
-
-
-
- Whether to disable the implicit grant type
-
-
-
-
-
-
-
-
- The configuration of the refresh token grant
- type.
-
-
-
-
-
-
- Whether to disable the refresh token grant
- type
-
-
-
-
-
-
-
-
- The configuration of the client credentials
- grant type.
-
-
-
-
-
-
- Whether to disable the refresh token grant
- type
-
-
-
-
-
-
-
-
- The configuration of the resource owner password
- grant type.
-
-
-
-
-
-
- Whether to disable the refresh token grant
- type
-
-
-
-
-
-
- A reference to an authentication manager that
- can be used to
- authenticate the resource owner
-
-
-
-
-
-
-
-
- The configuration of your custom grant type.
-
-
-
-
-
-
- Whether to disable this grant
- type
-
-
-
-
-
-
- A reference to your token granter
-
-
-
-
-
-
-
-
-
- The reference to the bean that defines the client
- details service.
-
-
-
-
-
-
- The URL at which a request for an access token
- will be serviced.
- Default value: "/oauth/token"
-
-
-
-
-
-
- The URL at which a user is redirected for
- authorization. Default
- value: "/oauth/authorize"
-
-
-
-
-
-
-
-
- The reference to the bean that defines the
- granter of different oauth
- token types.
-
-
-
-
-
-
-
- The reference to the bean that defines the
- implicit grant service.
-
-
-
-
-
-
-
- The reference to the bean that defines the token
- services. Default
- value is an instance of
- "org.springframework.security.oauth2.provider.token.DefaultTokenServices".
-
-
-
-
-
-
-
- The reference to the bean that defines the manager for
- authorization requests from the input
- parameters (e.g. request parameters).
- Default
- value is an
- instance of
- "org.springframework.security.oauth2.provider.token.DefaultAuthorizationRequestManager".
-
-
-
-
-
-
-
- Reference to a bean that handles user approval decisions. Using this strategy servers can
- selectively skip the approval process depending on decisions in the past or on the type of client.
-
-
-
-
-
-
-
- The URL of the page that handles the user
- approval form (if needed, depending on the grant type).
- The default is "forward:/oauth/confirm_access" which is not handled
- by the authorization endpoint, so normally you
- will have to supply a handler
- for this path.
-
-
-
-
-
-
-
- The URL of the page that handles errors (default forward:/oauth/error).
-
-
-
-
-
-
-
- The name of the form parameter that is used to
- indicate user
- approval of the client
- authentication
- request.
- Default value: "user_oauth_approval".
-
-
-
-
-
-
-
- The reference to the bean that defines the
- redirect resolver, used
- during the user
- authorization.
- Default
- value is an instance of
- "org.springframework.security.oauth2.provider.authorization_code.DefaultRedirectResolver".
-
-
-
-
-
-
-
-
-
-
- Specifies that there are oauth 2 protected resources in
- the application context. This element
- has an
- id which is the bean id of the filter created. The filter
- should be added to the Spring Security filter chain at
- position before="PRE_AUTH_FILTER"
-
-
-
-
-
-
-
-
-
- The resource id that is protected by this filter
- if any. If empty or
- absent then all resource ids
- are allowed,
- otherwise
- only tokens which are granted to a client that contains
- this reosurce
- id will be legal.
-
-
-
-
-
-
-
- The reference to the bean that defines the token
- services. Default
- value is an instance of
- "org.springframework.security.oauth2.provider.token.DefaultTokenServices".
-
-
-
-
-
-
-
- The reference to the bean that defines the entry point for failed authentications. Defaults to
- a vanilla
- org.springframework.security.oauth2.provider.error.OAuth2AuthenticationEntryPoint.
-
-
-
-
-
-
-
- The reference to the bean that defines the AuthenticationDetailsSource.
-
-
-
-
-
-
-
-
-
-
-
- Default element that contains the definition of the
- OAuth clients that are
- allowed to access this
- service.
-
-
-
-
-
-
-
-
-
-
- Definition of a client that can act on behalf
- of a user.
-
-
-
-
-
-
-
- The client id.
-
-
-
-
-
-
- The client secret. If the secret is
- undefined or empty (the
- default) the client does
- not
- require a
- secret.
-
-
-
-
-
-
- The re-direct URI(s) established during
- registration (optional, comma separated).
-
-
-
-
-
-
- The resource ids to which this client can be
- granted access
- (comma-separated). If missing or
- empty all
- resources are
- accessible (not recommended by the spec).
-
-
-
-
-
-
- The scopes to which the client is limited
- (comma-separated). If
- scope is undefined or empty
- (the
- default) the client
- is not limited by scope, but in that case
- the authorization
- service must explicitly
- accept unlimited
- access by not
- specifying any scopes itself.
-
-
-
-
-
-
- Grant types that are authorized for the
- client to use
- (comma-separated). Currently defined
- grant types
- include
- "authorization_code", "password", "assertion", and
- "refresh_token". Default value is
- "authorization_code,refresh_token".
-
-
-
-
-
-
- Authorities that are granted to the client
- (comma-separated). Distinct
- from the authorities
- granted to
- the user on behalf
- of whom the client is acting.
-
-
-
-
-
-
- The access token validity period in seconds (optional). If unspecified a global default will
- be applied by the token services.
-
-
-
-
-
-
- The refresh token validity period in seconds (optional). If unspecified a global default
- will
- be applied by the token services.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Element for declaring and configuring an expression
- handler for oauth
- security expressions. See
- http://static.springsource.org/spring-security/site/docs/3.0.x/reference/el-access.html
-
-
-
-
-
-
-
-
-
-
-
- Element for declaring and configuring an expression
- handler for oauth
- security expressions in http
- intercept urls. See
- http://static.springsource.org/spring-security/site/docs/3.0.x/reference/el-access.html
-
-
-
-
-
-
-
-
-
-
-
- Creates the oauth 2 client filter be be added to the
- application security policy.
-
-
-
-
-
-
-
-
- The reference to the bean that defines the
- redirect strategy, used when redirecting the user for
- access authorization. Default value is an instance of
- "org.springframework.security.web.DefaultRedirectStrategy".
-
-
-
-
-
-
-
-
-
-
-
- Definition of a remote resource that is protected via
- OAuth2 to which this client application wants
- access.
-
-
-
-
-
-
-
-
- The grant type. Currently defined grant types
- include
- "authorization_code", "password", and
- "assertion".
- Default value
- is "authorization_code".
-
-
-
-
-
-
- The client id. This is the id by which the
- resource server will
- identify this application.
-
-
-
-
-
-
- The uri to where the access token may be
- obtained.
-
-
-
-
-
-
- Comma-separted list of string specifying the
- scope of the access to the
- resource. By default,
- no
- scope will be
- specified.
-
-
-
-
-
-
- The secret asssociated with the resource. By
- default, no secret
- will be supplied for access to
- the resource.
-
-
-
-
-
-
- The scheme that is used to pass the client
- secret. Suggested
- values: "header" and "form".
- Default:
- "header".
- See section 2.1 of the OAuth 2 spec.
-
-
-
-
-
-
- The uri to which the user will be redirected if
- the user is ever
- needed to grant an authorization
- code.
-
-
-
-
-
-
- The method for bearing the token when accessing
- the resource.
- Default value is "header". See
- AuthenticationScheme enum for possible values.
-
-
-
-
-
-
- The name of the bearer token. The default is
- "access_token", which
- is according to the spec,
- but
- some providers
- (e.g. Facebook) don't conform to the spec.
-
-
-
-
-
-
- Some resource servers may require a
- pre-established URI to which
- they will redirect users after
- users
- authorize an access token.
-
-
-
-
-
-
- Boolean flag indicating that the current URI should be used as a redirect (if available) rather
- than the
- registered redirect URI. Default is true.
-
-
-
-
-
-
- The username for authentication, required only when type is "password".
-
-
-
-
-
-
- The password for authentication, required only when type is "password".
-
-
-
-
-
-
-
-
-
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/org/springframework/security/oauth2/spring-security-oauth2-2.0.xsd b/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/org/springframework/security/oauth2/spring-security-oauth2-2.0.xsd
deleted file mode 100644
index 31281626b..000000000
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/org/springframework/security/oauth2/spring-security-oauth2-2.0.xsd
+++ /dev/null
@@ -1,769 +0,0 @@
-
-
-
-
-
-
- Creates an OAuth2RestTemplate with all the pieces needed to connect to a remote resource from
- a web
- application. Injects request and session-scoped beans into the template, so can only be
- used in the context of a web
- request.
-
-
-
-
-
-
-
-
-
-
-
-
- The OAuth2ProtectedResourceDetails governing the configuration of this client. Mandatory.
-
-
-
-
-
-
- The reference to the bean that manages access token acquisition. Optional (defaults to a chain
- including common grant types from the spec).
-
-
-
-
-
-
-
-
-
-
-
- Specifies that the oauth 2 authorization and token
- endpoints should be created in the application
- context. These are
- implemented as regular Spring @Controller beans, so as long as the
- default Spring MVC set up in
- present in the application
- the endpoints should work (at /oauth/authorization and /oauth/token by
- default).
-
-
-
-
-
-
-
-
- The configuration of the authorization code
- mechanism. This
- mechanism enables a way for clients to
- obtain an
- access token by obtaining an authorization code.
-
-
-
-
-
-
- Whether to disable the authorization code
- mechanism.
-
-
-
-
-
-
- The reference to the bean that defines the
- authorization code
- services. Default value is an
- instance of
- "org.springframework.security.oauth2.provider.authorization_code.InMemoryAuthorizationCodeServices".
-
-
-
-
-
-
-
-
- The configuration of the client credentials
- grant type.
-
-
-
-
-
-
- Whether to disable the implicit grant type
-
-
-
-
-
-
-
-
- The configuration of the refresh token grant
- type.
-
-
-
-
-
-
- Whether to disable the refresh token grant
- type
-
-
-
-
-
-
-
-
- The configuration of the client credentials
- grant type.
-
-
-
-
-
-
- Whether to disable the refresh token grant
- type
-
-
-
-
-
-
-
-
- The configuration of the resource owner password
- grant type.
-
-
-
-
-
-
- Whether to disable the refresh token grant
- type
-
-
-
-
-
-
- A reference to an authentication manager that
- can be used to
- authenticate the resource owner
-
-
-
-
-
-
-
-
- The configuration of your custom grant type.
-
-
-
-
-
-
- Whether to disable this grant
- type
-
-
-
-
-
-
- A reference to your token granter
-
-
-
-
-
-
-
-
-
- The reference to the bean that defines the client
- details service.
-
-
-
-
-
-
- The URL at which a request for an access token
- will be serviced.
- Default value: "/oauth/token"
-
-
-
-
-
-
- The URL at which a user is redirected for
- authorization. Default
- value: "/oauth/authorize"
-
-
-
-
-
-
-
-
- The reference to the bean that defines the
- granter of different oauth
- token types.
-
-
-
-
-
-
-
- @deprecated (since 2.0.2 this is unnecessary). The reference to the bean that defines the
- implicit grant service.
-
-
-
-
-
-
-
- The reference to the bean that defines the
- OAuth2RequestValidator implementation. Default
- value is an instance of
- "org.springframework.security.oauth2.provider.DefaultOAuth2RequestValidator".
-
-
-
-
-
-
-
- The reference to the bean that defines the token
- services. Default
- value is an instance of
- "org.springframework.security.oauth2.provider.token.DefaultTokenServices".
-
-
-
-
-
-
-
- The reference to the bean that defines the manager for
- authorization requests from the input
- parameters (e.g. request parameters).
- Default
- value is an
- instance of
- "org.springframework.security.oauth2.provider.token.DefaultAuthorizationRequestManager".
-
-
-
-
-
-
-
- Reference to a bean that handles user approval decisions. Using this strategy servers can
- selectively skip the approval process depending on decisions in the past or on the type of client.
-
-
-
-
-
-
-
- The URL of the page that handles the user
- approval form (if needed, depending on the grant type).
- The default is "forward:/oauth/confirm_access" which is not handled
- by the authorization endpoint, so normally you
- will have to supply a handler
- for this path.
-
-
-
-
-
-
-
- The URL of the page that handles errors (default forward:/oauth/error).
-
-
-
-
-
-
-
- The name of the form parameter that is used to
- indicate user
- approval of the client
- authentication
- request.
- Default value: "user_oauth_approval".
-
-
-
-
-
-
-
- The reference to the bean that defines the
- redirect resolver, used
- during the user
- authorization.
- Default
- value is an instance of
- "org.springframework.security.oauth2.provider.authorization_code.DefaultRedirectResolver".
-
-
-
-
-
-
-
-
-
-
- Specifies that there are oauth 2 protected resources in
- the application context. This element
- has an
- id which is the bean id of the filter created. The filter
- should be added to the Spring Security filter chain at
- position before="PRE_AUTH_FILTER"
-
-
-
-
-
-
-
-
-
- The resource id that is protected by this filter
- if any. If empty or
- absent then all resource ids
- are allowed,
- otherwise
- only tokens which are granted to a client that contains
- this reosurce
- id will be legal.
-
-
-
-
-
-
-
- The reference to the bean that defines the token
- services. Default
- value is an instance of
- "org.springframework.security.oauth2.provider.token.DefaultTokenServices".
-
-
-
-
-
-
-
- The reference to the bean that defines the authentication manager
- for the incoming tokens. If provided then the resource id and token services
- are ignored. Default
- value is an instance of
- "org.springframework.security.oauth2.provider.token.OAuth2AuthenticationManager".
-
-
-
-
-
-
-
- The reference to the bean that defines the token
- extractor. Default
- value is an instance of
- "org.springframework.security.oauth2.provider.authentication.BearerTokenExtractor".
-
-
-
-
-
-
-
- The reference to the bean that defines the entry point for failed authentications. Defaults to
- a vanilla
- org.springframework.security.oauth2.provider.error.OAuth2AuthenticationEntryPoint.
-
-
-
-
-
-
-
- The reference to the bean that defines the AuthenticationDetailsSource.
-
-
-
-
-
-
-
-
-
-
-
- Default element that contains the definition of the
- OAuth clients that are
- allowed to access this
- service.
-
-
-
-
-
-
-
-
-
-
- Definition of a client that can act on behalf
- of a user.
-
-
-
-
-
-
-
- The client id.
-
-
-
-
-
-
- The client secret. If the secret is
- undefined or empty (the
- default) the client does
- not
- require a
- secret.
-
-
-
-
-
-
- The re-direct URI(s) established during
- registration (optional, comma separated).
-
-
-
-
-
-
- The resource ids to which this client can be
- granted access
- (comma-separated). If missing or
- empty all
- resources are
- accessible (not recommended by the spec).
-
-
-
-
-
-
- The scopes to which the client is limited
- (comma-separated). If
- scope is undefined or empty
- (the
- default) the client
- is not limited by scope, but in that case
- the authorization
- service must explicitly
- accept unlimited
- access by not
- specifying any scopes itself.
-
-
-
-
-
-
- Grant types that are authorized for the
- client to use
- (comma-separated). Currently defined
- grant types
- include
- "authorization_code", "password", "assertion", and
- "refresh_token". Default value is
- "authorization_code,refresh_token".
-
-
-
-
-
-
- Authorities that are granted to the client
- (comma-separated). Distinct
- from the authorities
- granted to
- the user on behalf
- of whom the client is acting.
-
-
-
-
-
-
- Scopes or scope patterns that are autoapproved (comma-separated), or just "true" to autoapprove all.
-
-
-
-
-
-
- The access token validity period in seconds (optional). If unspecified a global default will
- be applied by the token services.
-
-
-
-
-
-
- The refresh token validity period in seconds (optional). If unspecified a global default
- will
- be applied by the token services.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Element for declaring and configuring an expression
- handler for oauth
- security expressions. See
- http://static.springsource.org/spring-security/site/docs/3.0.x/reference/el-access.html
-
-
-
-
-
-
-
-
-
-
-
- Element for declaring and configuring an expression
- handler for oauth
- security expressions in http
- intercept urls. See
- http://static.springsource.org/spring-security/site/docs/3.0.x/reference/el-access.html
-
-
-
-
-
-
-
-
-
-
-
- Creates the oauth 2 client filter be be added to the
- application security policy.
-
-
-
-
-
-
-
-
- The reference to the bean that defines the
- redirect strategy, used when redirecting the user for
- access authorization. Default value is an instance of
- "org.springframework.security.web.DefaultRedirectStrategy".
-
-
-
-
-
-
-
-
-
-
-
- Definition of a remote resource that is protected via
- OAuth2 to which this client application wants
- access.
-
-
-
-
-
-
-
-
- The grant type. Currently defined grant types
- include
- "authorization_code", "password", and
- "assertion".
- Default value
- is "authorization_code".
-
-
-
-
-
-
- The client id. This is the id by which the
- resource server will
- identify this application.
-
-
-
-
-
-
- The uri to where the access token may be
- obtained.
-
-
-
-
-
-
- Comma-separted list of string specifying the
- scope of the access to the
- resource. By default,
- no
- scope will be
- specified.
-
-
-
-
-
-
- The secret asssociated with the resource. By
- default, no secret
- will be supplied for access to
- the resource.
-
-
-
-
-
-
- The scheme that is used to pass the client
- secret. Suggested
- values: "header" and "form".
- Default:
- "header".
- See section 2.1 of the OAuth 2 spec.
-
-
-
-
-
-
- The uri to which the user will be redirected if
- the user is ever
- needed to grant an authorization
- code.
-
-
-
-
-
-
- The method for bearing the token when accessing
- the resource.
- Default value is "header". See
- AuthenticationScheme enum for possible values.
-
-
-
-
-
-
- The name of the bearer token. The default is
- "access_token", which
- is according to the spec,
- but
- some providers
- (e.g. Facebook) don't conform to the spec.
-
-
-
-
-
-
- Some resource servers may require a
- pre-established URI to which
- they will redirect users after
- users
- authorize an access token.
-
-
-
-
-
-
- Boolean flag indicating that the current URI should be used as a redirect (if available) rather
- than the
- registered redirect URI. Default is true.
-
-
-
-
-
-
- The username for authentication, required only when type is "password".
-
-
-
-
-
-
- The password for authentication, required only when type is "password".
-
-
-
-
-
-
-
-
-
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-oauth-2.0/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index e64bd1c49..000000000
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Title: maxkey-protocol-oauth-2.0
-Implementation-Version: 3.0.0.RELEASE
-Implementation-Date: 2019-03-05T21:26:16.801+08:00[GMT+08:00]
-Created-By: com.connsec.maxkey
-Implementation-Vendor: http://www.connsec.com
-
diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/.classpath b/maxkey-protocols/maxkey-protocol-saml-2.0/.classpath
index 0b72ca4b5..4857be400 100644
--- a/maxkey-protocols/maxkey-protocol-saml-2.0/.classpath
+++ b/maxkey-protocols/maxkey-protocol-saml-2.0/.classpath
@@ -1,7 +1,12 @@
-
+
+
+
diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/.project b/maxkey-protocols/maxkey-protocol-saml-2.0/.project
index f4fed4189..a554271d3 100644
--- a/maxkey-protocols/maxkey-protocol-saml-2.0/.project
+++ b/maxkey-protocols/maxkey-protocol-saml-2.0/.project
@@ -1,7 +1,7 @@
maxkey-protocol-saml-2.0
- Project maxkey-protocol-saml-2.0 created by Buildship.
+ maxkey-protocol-saml-2.0
@@ -20,11 +20,6 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
org.eclipse.wst.validation.validationbuilder
@@ -32,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/maxkey-protocol-saml-2.0/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-protocols/maxkey-protocol-saml-2.0/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-oauth-2.0/build/resources/main/META-INF/MANIFEST.MF
rename to maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle b/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle
index bedc2af33..9d49a7c37 100644
--- a/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle
+++ b/maxkey-protocols/maxkey-protocol-saml-2.0/build.gradle
@@ -2,18 +2,7 @@ description = "maxkey-protocol-saml-2.0"
dependencies {
//local jars
- compile fileTree(dir: '../../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/spring-security/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/tiles/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
compile project(":maxkey-core")
compile project(":maxkey-dao")
diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/build/libs/maxkey-protocol-saml-2.0-3.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-saml-2.0/build/libs/maxkey-protocol-saml-2.0-3.0.0.RELEASE.jar
deleted file mode 100644
index ae88cccea..000000000
Binary files a/maxkey-protocols/maxkey-protocol-saml-2.0/build/libs/maxkey-protocol-saml-2.0-3.0.0.RELEASE.jar and /dev/null differ
diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-saml-2.0/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index 54fc2eee4..000000000
--- a/maxkey-protocols/maxkey-protocol-saml-2.0/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Title: maxkey-protocol-saml-2.0
-Implementation-Version: 3.0.0.RELEASE
-Implementation-Date: 2019-03-05T21:26:16.810+08:00[GMT+08:00]
-Created-By: com.connsec.maxkey
-Implementation-Vendor: http://www.connsec.com
-
diff --git a/maxkey-protocols/maxkey-protocol-simulate/.classpath b/maxkey-protocols/maxkey-protocol-simulate/.classpath
index 768ca61c7..aa1a7e5d2 100644
--- a/maxkey-protocols/maxkey-protocol-simulate/.classpath
+++ b/maxkey-protocols/maxkey-protocol-simulate/.classpath
@@ -7,5 +7,5 @@
maxkey-protocol-simulate
- Project maxkey-protocol-simulate created by Buildship.
+ maxkey-protocol-simulate
@@ -27,10 +27,10 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.component b/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.component
index d152bbd40..a2d44d304 100644
--- a/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.component
+++ b/maxkey-protocols/maxkey-protocol-simulate/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
diff --git a/maxkey-protocols/maxkey-protocol-simulate/build/libs/maxkey-protocol-simulate-3.0.0.RELEASE.war b/maxkey-protocols/maxkey-protocol-simulate/build/libs/maxkey-protocol-simulate-3.0.0.RELEASE.war
deleted file mode 100644
index 0bdc6eb67..000000000
Binary files a/maxkey-protocols/maxkey-protocol-simulate/build/libs/maxkey-protocol-simulate-3.0.0.RELEASE.war and /dev/null differ
diff --git a/maxkey-protocols/maxkey-protocol-simulate/build/tmp/war/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-simulate/build/tmp/war/MANIFEST.MF
deleted file mode 100644
index 59499bce4..000000000
--- a/maxkey-protocols/maxkey-protocol-simulate/build/tmp/war/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/.classpath b/maxkey-protocols/maxkey-protocol-tokenbased/.classpath
index 0b72ca4b5..4857be400 100644
--- a/maxkey-protocols/maxkey-protocol-tokenbased/.classpath
+++ b/maxkey-protocols/maxkey-protocol-tokenbased/.classpath
@@ -1,7 +1,12 @@
-
+
+
+
diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/.project b/maxkey-protocols/maxkey-protocol-tokenbased/.project
index 5f7a00799..ce3827e2c 100644
--- a/maxkey-protocols/maxkey-protocol-tokenbased/.project
+++ b/maxkey-protocols/maxkey-protocol-tokenbased/.project
@@ -1,7 +1,7 @@
maxkey-protocol-tokenbased
- Project maxkey-protocol-tokenbased created by Buildship.
+ maxkey-protocol-tokenbased
@@ -20,11 +20,6 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
org.eclipse.wst.validation.validationbuilder
@@ -32,10 +27,9 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/.settings/org.eclipse.jdt.core.prefs b/maxkey-protocols/maxkey-protocol-tokenbased/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/maxkey-protocols/maxkey-protocol-tokenbased/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/bin/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-tokenbased/bin/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/maxkey-protocols/maxkey-protocol-tokenbased/bin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/bin/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-protocols/maxkey-protocol-saml-2.0/bin/META-INF/MANIFEST.MF
rename to maxkey-protocols/maxkey-protocol-tokenbased/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle b/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle
index d55e898b0..9a40e0991 100644
--- a/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle
+++ b/maxkey-protocols/maxkey-protocol-tokenbased/build.gradle
@@ -4,18 +4,7 @@ description = "maxkey-protocol-tokenbased"
dependencies {
//local jars
- compile fileTree(dir: '../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/spring-security/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/tiles/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
compile project(":maxkey-core")
compile project(":maxkey-dao")
diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/build/libs/maxkey-protocol-tokenbased-3.0.0.RELEASE.jar b/maxkey-protocols/maxkey-protocol-tokenbased/build/libs/maxkey-protocol-tokenbased-3.0.0.RELEASE.jar
deleted file mode 100644
index b1b57ea51..000000000
Binary files a/maxkey-protocols/maxkey-protocol-tokenbased/build/libs/maxkey-protocol-tokenbased-3.0.0.RELEASE.jar and /dev/null differ
diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/build/tmp/jar/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-tokenbased/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index 951b6b755..000000000
--- a/maxkey-protocols/maxkey-protocol-tokenbased/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Title: maxkey-protocol-tokenbased
-Implementation-Version: 3.0.0.RELEASE
-Implementation-Date: 2019-03-05T21:26:16.820+08:00[GMT+08:00]
-Created-By: com.connsec.maxkey
-Implementation-Vendor: http://www.connsec.com
-
diff --git a/maxkey-webs/.classpath b/maxkey-webs/.classpath
index 8d8d85f14..eb19361b5 100644
--- a/maxkey-webs/.classpath
+++ b/maxkey-webs/.classpath
@@ -2,5 +2,5 @@
diff --git a/maxkey-webs/.project b/maxkey-webs/.project
index e7571e4f0..7b98f6957 100644
--- a/maxkey-webs/.project
+++ b/maxkey-webs/.project
@@ -1,7 +1,7 @@
maxkey-webs
- Project maxkey-webs created by Buildship.
+
@@ -17,7 +17,7 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-webs/.settings/org.eclipse.jdt.core.prefs b/maxkey-webs/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-webs/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-webs/maxkey-web-kerberos/.classpath b/maxkey-webs/maxkey-web-kerberos/.classpath
index 394f57b8c..708b1a19b 100644
--- a/maxkey-webs/maxkey-web-kerberos/.classpath
+++ b/maxkey-webs/maxkey-web-kerberos/.classpath
@@ -1,6 +1,11 @@
-
+
+
+
@@ -8,5 +13,5 @@
-
diff --git a/maxkey-webs/maxkey-web-kerberos/.project b/maxkey-webs/maxkey-web-kerberos/.project
index 99f981beb..f0d92db7d 100644
--- a/maxkey-webs/maxkey-web-kerberos/.project
+++ b/maxkey-webs/maxkey-web-kerberos/.project
@@ -1,7 +1,7 @@
maxkey-web-kerberos
- Project maxkey-web-kerberos created by Buildship.
+ maxkey-web-kerberos
@@ -27,10 +27,10 @@
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-webs/maxkey-web-kerberos/.settings/org.eclipse.jdt.core.prefs b/maxkey-webs/maxkey-web-kerberos/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-webs/maxkey-web-kerberos/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-webs/maxkey-web-kerberos/.settings/org.eclipse.wst.common.component b/maxkey-webs/maxkey-web-kerberos/.settings/org.eclipse.wst.common.component
index 09a6b1174..9a0393564 100644
--- a/maxkey-webs/maxkey-web-kerberos/.settings/org.eclipse.wst.common.component
+++ b/maxkey-webs/maxkey-web-kerberos/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
-
+
+
+
+
+
+
+
@@ -9,5 +19,5 @@
-
diff --git a/maxkey-webs/maxkey-web-manage/.project b/maxkey-webs/maxkey-web-manage/.project
index 135949023..b4a45dfd2 100644
--- a/maxkey-webs/maxkey-web-manage/.project
+++ b/maxkey-webs/maxkey-web-manage/.project
@@ -1,7 +1,7 @@
maxkey-web-manage
- Project maxkey-web-manage created by Buildship.
+ maxkey-web-manage
@@ -25,17 +25,12 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-webs/maxkey-web-manage/.settings/org.eclipse.jdt.core.prefs b/maxkey-webs/maxkey-web-manage/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35068d95f..000000000
--- a/maxkey-webs/maxkey-web-manage/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/maxkey-webs/maxkey-web-manage/.settings/org.eclipse.wst.common.component b/maxkey-webs/maxkey-web-manage/.settings/org.eclipse.wst.common.component
index 5ed7c0e28..152c02652 100644
--- a/maxkey-webs/maxkey-web-manage/.settings/org.eclipse.wst.common.component
+++ b/maxkey-webs/maxkey-web-manage/.settings/org.eclipse.wst.common.component
@@ -1,22 +1,10 @@
-
+
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
uses
@@ -26,5 +14,17 @@
uses
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
diff --git a/maxkey-webs/maxkey-web-manage/bin/META-INF/MANIFEST.MF b/maxkey-webs/maxkey-web-manage/bin/META-INF/MANIFEST.MF
deleted file mode 100644
index 59499bce4..000000000
--- a/maxkey-webs/maxkey-web-manage/bin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/maxkey-demos/maxkey-demo-jwt/build/tmp/war/MANIFEST.MF b/maxkey-webs/maxkey-web-manage/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-demos/maxkey-demo-jwt/build/tmp/war/MANIFEST.MF
rename to maxkey-webs/maxkey-web-manage/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-webs/maxkey-web-manage/bin/config/applicationConfig.properties b/maxkey-webs/maxkey-web-manage/bin/main/config/applicationConfig.properties
similarity index 100%
rename from maxkey-webs/maxkey-web-manage/bin/config/applicationConfig.properties
rename to maxkey-webs/maxkey-web-manage/bin/main/config/applicationConfig.properties
diff --git a/maxkey-webs/maxkey-web-manage/bin/config/clientKeystore.jks b/maxkey-webs/maxkey-web-manage/bin/main/config/clientKeystore.jks
similarity index 100%
rename from maxkey-webs/maxkey-web-manage/bin/config/clientKeystore.jks
rename to maxkey-webs/maxkey-web-manage/bin/main/config/clientKeystore.jks
diff --git a/maxkey-webs/maxkey-web-manage/bin/config/connsecKeystore.jks b/maxkey-webs/maxkey-web-manage/bin/main/config/connsecKeystore.jks
similarity index 100%
rename from maxkey-webs/maxkey-web-manage/bin/config/connsecKeystore.jks
rename to maxkey-webs/maxkey-web-manage/bin/main/config/connsecKeystore.jks
diff --git a/maxkey-webs/maxkey-web-manage/bin/config/keystore.jwks b/maxkey-webs/maxkey-web-manage/bin/main/config/keystore.jwks
similarity index 100%
rename from maxkey-webs/maxkey-web-manage/bin/config/keystore.jwks
rename to maxkey-webs/maxkey-web-manage/bin/main/config/keystore.jwks
diff --git a/maxkey-webs/maxkey-web-manage/bin/log4j.properties b/maxkey-webs/maxkey-web-manage/bin/main/log4j.properties
similarity index 100%
rename from maxkey-webs/maxkey-web-manage/bin/log4j.properties
rename to maxkey-webs/maxkey-web-manage/bin/main/log4j.properties
diff --git a/maxkey-webs/maxkey-web-manage/build.gradle b/maxkey-webs/maxkey-web-manage/build.gradle
index 26fed4ab4..40113b6d0 100644
--- a/maxkey-webs/maxkey-web-manage/build.gradle
+++ b/maxkey-webs/maxkey-web-manage/build.gradle
@@ -5,16 +5,7 @@ apply plugin: 'eclipse-wtp'
dependencies {
//local jars
- compile fileTree(dir: '../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar')
compile project(":maxkey-core")
compile project(":maxkey-jose-jwt")
diff --git a/maxkey-webs/maxkey-web-manage/build/libs/maxkey-web-manage-3.0.0.RELEASE.war b/maxkey-webs/maxkey-web-manage/build/libs/maxkey-web-manage-3.0.0.RELEASE.war
deleted file mode 100644
index 7dcdaac2f..000000000
Binary files a/maxkey-webs/maxkey-web-manage/build/libs/maxkey-web-manage-3.0.0.RELEASE.war and /dev/null differ
diff --git a/maxkey-webs/maxkey-web-manage/build/resources/main/config/applicationConfig.properties b/maxkey-webs/maxkey-web-manage/build/resources/main/config/applicationConfig.properties
deleted file mode 100644
index 60f46e601..000000000
--- a/maxkey-webs/maxkey-web-manage/build/resources/main/config/applicationConfig.properties
+++ /dev/null
@@ -1,103 +0,0 @@
-############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2015 ConnSec SoftWare, Inc.
-# We're focus on Cloud Computing and Security
-# http://www.connsec.com
-############################################################################
-
-
-############################################################################
-# Application Configuration
-############################################################################
-# DataBase configuration
-# JDBC Driver
-# for MySql com.mysql.jdbc.Driver
-# for oracle oracle.jdbc.driver.OracleDriver
-# for DB2 com.ibm.db2.jdbc.app.DB2Driver
-# for SqlServer com.microsoft.jdbc.sqlserver.SQLServerDriver
-# for SyBase com.sybase.jdbc.SybDriver
-# for PostgreSQL org.postgresql.Driver
-# for Derby org.apache.derby.jdbc.ClientDriver
-config.datasource.driverclass=com.mysql.jdbc.Driver
-# JDBC URL
-# you need database hostname,port,databasename
-# for MySql jdbc:mysql://hostname:port/secdb
-# for oracle jdbc:oracle:thin:@hostname:port:secdb
-# for DB2 jdbc:db2://hostname:port/secdb
-# for SqlServer jdbc:microsoft:sqlserver://hostname:port;DatabaseName=secdb
-# for SyBase jdbc:sybase:Tds:hostname:port/secdb
-# for Derby jdbc:derby://localhost:1527/secdb
-#
-config.datasource.url=jdbc:mysql://localhost/secdb?autoReconnect=true&characterEncoding=UTF-8
-config.datasource.username=root
-#connsec/bb2002b9f55b05d3e0e6f34ec5321051
-config.datasource.password=bb2002b9f55b05d3e0e6f34ec5321051
-#db2,derby,mysql,oracle,postgresql,sqlserver at com.connsec.db.mybatis.dialect.Dialect
-config.datasource.database=mysql
-# End DataBase configuration
-############################################################################
-# CharacterEncoding
-#CharacterEncoding true/false
-config.characterencoding.encoding=true
-config.characterencoding.fromcharset=iso8859-1
-config.characterencoding.tocharset=UTF-8
-# End CharacterEncoding
-############################################################################
-
-############################################################################
-# Login
-config.login.captcha=false
-config.login.socialAuth=true
-config.login.msad.kerberos=false
-# End Login
-############################################################################
-
-
-############################################################################
-# domain name configuration
-config.domain.name=login.connsec.com
-config.server.name=http://${config.domain.name}
-config.server.prefix=${config.server.name}/manage
-############################################################################
-# EMAIL configuration
-
-config.email.username=test@connsec.com
-config.email.password=3&8Ujbnm5hkjhFD
-config.email.smtpHost=smtp.exmail.qq.com
-config.email.port=25
-config.email.senderMail=test@connsec.com
-config.email.ssl=false
-
-############################################################################
-# SAML V2.0 configuration
-# saml common
-config.saml.v20.max.parser.pool.size=2
-config.saml.v20.assertion.validity.time.ins.seconds=90
-config.saml.v20.replay.cache.life.in.millis=14400000
-config.saml.v20.issue.instant.check.clock.skew.in.seconds=90
-config.saml.v20.issue.instant.check.validity.time.in.seconds=300
-
-
-#saml idp keystore
-config.saml.v20.idp.keystore.password=connsec
-config.saml.v20.idp.keystore.private.key.password=connsec
-config.saml.v20.idp.keystore=classpath\:config/connsecKeystore.jks
-config.saml.v20.idp.issuing.entity.id=connsec.com
-config.saml.v20.idp.issuer=http://connsec.com
-
-config.saml.v20.idp.receiver.endpoint=http://login.connsec.com/
-
-#saml sp keystore
-config.saml.v20.sp.keystore.password=connsec
-config.saml.v20.sp.keystore.private.key.password=connsec
-config.saml.v20.sp.keystore=classpath\:config/clientKeystore.jks
-config.saml.v20.sp.issuing.entity.id=client.connsec.com
-
-############################################################################
-config.oidc.metadata.issuer=http://login.connsec.com
-config.oidc.metadata.authorizationEndpoint=http://login.connsec.com/maxkey/oauth/v20/authorize
-config.oidc.metadata.tokenEndpoint=http://login.connsec.com/maxkey/oauth/v20/token
-config.oidc.metadata.userinfoEndpoint=http://login.connsec.com/maxkey/api/connect/userinfo
-#############################################################################
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-manage/build/resources/main/log4j.properties b/maxkey-webs/maxkey-web-manage/build/resources/main/log4j.properties
deleted file mode 100644
index fb36f2ced..000000000
--- a/maxkey-webs/maxkey-web-manage/build/resources/main/log4j.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-# General Log Settings
-#log4j.rootLogger=INFO,LOGFILE,stdout
-log4j.rootLogger=INFO,LOGFILE,stdout
-
-#appender config:stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%c:%p %X %L] %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%-d{HH:mm:ss.SSS} [%c:%p %X{$UserName$} %L] %m%n
-
-#appender config:LOGFILE
-# log file arrcoss file size
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-#log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.LOGFILE.DatePattern=.yyyy-MM-dd
-log4j.appender.LOGFILE.File=${catalina.home}/logs/connsec-sec-admin-out.log
-log4j.appender.LOGFILE.maxFileSize=2048KB
-log4j.appender.LOGFILE.MaxBackupIndex = 5
-
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%c:%p] %m%n
-
-log4j.appender.DEBUG=org.apache.log4j.RollingFileAppender
-log4j.appender.DEBUG.File=${catalina.home}/logs/connsec-sec-admin-debug.log
-log4j.appender.DEBUG.maxFileSize=2048KB
-log4j.appender.DEBUG.MaxBackupIndex = 5
-log4j.appender.DEBUG.DatePattern=.yyyy-MM-dd
-log4j.appender.DEBUG.layout=org.apache.log4j.PatternLayout
-log4j.appender.DEBUG.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-#log4j.appender.ERROR=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.ERROR.DatePattern=.yyyy-MM-dd
-log4j.appender.ERROR=org.apache.log4j.RollingFileAppender
-log4j.appender.ERROR.File=${catalina.home}/logs/connsec-sec-admin-error.log
-
-log4j.appender.ERROR.maxFileSize=2048KB
-log4j.appender.ERROR.MaxBackupIndex = 5
-
-log4j.appender.ERROR.layout=org.apache.log4j.PatternLayout
-log4j.appender.ERROR.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-# spring
-log4j.logger.org.springframework=INFO
-log4j.logger.org.springframework.aop.framework=INFO
-log4j.logger.org.springframework.transaction=INFO
-log4j.logger.org.springframework.transaction.support=INFO
-#mybatis
-log4j.logger.org.mybatis=INFO
-log4j.logger.org.apache.ibatis=INFO
-#java.sql
-log4j.logger.java.sql=DEBUG
-log4j.logger.java.sql.Connection=DEBUG
-log4j.logger.java.sql.Statement=DEBUG
-log4j.logger.java.sql.PreparedStatement=DEBUG
-log4j.logger.java.sql.ResultSet=DEBUG
-#com.connsec
-log4j.logger.com.connsec.web.i18n=INFO
-log4j.logger.com.connsec.web.WebContext=INFO
-log4j.logger.com.connsec.web.tag=INFO
-log4j.logger.com.connsec=DEBUG
-log4j.logger.com.connsec.db=DEBUG
-log4j.logger.com.connsec.web=DEBUG
-log4j.logger.com.connsec.db.persistence=TRACE
-log4j.logger.com.connsec.dao.persistence=TRACE
-log4j.logger.com.connsec.dao.service=DEBUG
diff --git a/maxkey-webs/maxkey-web-manage/build/tmp/war/MANIFEST.MF b/maxkey-webs/maxkey-web-manage/build/tmp/war/MANIFEST.MF
deleted file mode 100644
index 59499bce4..000000000
--- a/maxkey-webs/maxkey-web-manage/build/tmp/war/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/maxkey-webs/maxkey-web-maxkey/.classpath b/maxkey-webs/maxkey-web-maxkey/.classpath
index 41ef6c7c3..1501fbb14 100644
--- a/maxkey-webs/maxkey-web-maxkey/.classpath
+++ b/maxkey-webs/maxkey-web-maxkey/.classpath
@@ -1,8 +1,23 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -10,5 +25,5 @@
-
diff --git a/maxkey-webs/maxkey-web-maxkey/.project b/maxkey-webs/maxkey-web-maxkey/.project
index 01f2db587..66728c3e2 100644
--- a/maxkey-webs/maxkey-web-maxkey/.project
+++ b/maxkey-webs/maxkey-web-maxkey/.project
@@ -1,7 +1,7 @@
maxkey-web-maxkey
- Project maxkey-web-maxkey created by Buildship.
+ maxkey-web-maxkey
maxkey-protocol-desktop
maxkey-protocol-ltpa
@@ -11,7 +11,6 @@
maxkey-protocol-authorize
maxkey-protocol-saml-2.0
maxkey-protocol-oauth-2.0
- maxkey-protocol-saml-common
maxkey-authentications
maxkey-protocol-formbased
maxkey-protocol-simulate
@@ -19,7 +18,6 @@
maxkey-core
maxkey-protocol-extendapi
maxkey-protocol-cas
- maxkey-protocol-saml-1.1
@@ -42,17 +40,12 @@
-
- org.springframework.ide.eclipse.boot.validation.springbootbuilder
-
-
-
- org.eclipse.buildship.core.gradleprojectnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/maxkey-webs/maxkey-web-maxkey/.settings/org.eclipse.jdt.core.prefs b/maxkey-webs/maxkey-web-maxkey/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 87b7a7a3a..000000000
--- a/maxkey-webs/maxkey-web-maxkey/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/maxkey-webs/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component b/maxkey-webs/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component
index 6c8d27eda..f7cbf6de4 100644
--- a/maxkey-webs/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component
+++ b/maxkey-webs/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component
@@ -1,34 +1,13 @@
-
+
- uses
-
-
- uses
-
-
- uses
-
-
- uses
-
uses
-
- uses
-
-
- uses
-
-
- uses
-
uses
@@ -47,5 +26,26 @@
uses
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
+
+ uses
+
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/META-INF/MANIFEST.MF b/maxkey-webs/maxkey-web-maxkey/bin/META-INF/MANIFEST.MF
deleted file mode 100644
index 59499bce4..000000000
--- a/maxkey-webs/maxkey-web-maxkey/bin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/config/applicationLogin.properties b/maxkey-webs/maxkey-web-maxkey/bin/config/applicationLogin.properties
deleted file mode 100644
index 6a4d46fe8..000000000
--- a/maxkey-webs/maxkey-web-maxkey/bin/config/applicationLogin.properties
+++ /dev/null
@@ -1,102 +0,0 @@
-############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
-############################################################################
-# domain name configuration
-config.domain.name=login.connsec.com
-config.server.name=http://${config.domain.name}
-config.server.prefix=${config.server.name}/maxkey
-############################################################################
-# Login configuration
-#enable captcha
-config.login.captcha=true
-#enable two factor,use one time password
-config.login.onetimepwd=true
-#enable social sign on
-config.login.socialsignon=true
-#Enable kerberos/SPNEGO
-config.login.kerberos=true
-#wsFederation
-config.login.wsfederation=false
-#remeberme
-config.login.remeberme=true
-#validity
-config.login.remeberme.validity=
-#default.uri
-#to appList page
-config.login.default.uri=appList
-#to default application web site
-#config.login.default.uri=http://www.connsec.com
-
-config.manage.uri=http://login.connsec.com:9500/manage/login
-
-config.ipaddress.whitelist=false
-############################################################################
-# Kerberos Login configuration
-############################################################################
-#short name of user domain must be in upper case,eg:CONNSEC
-config.support.kerberos.default.userdomain=CONNSEC
-#short name of user domain must be in upper case,eg:CONNSEC.COM
-config.support.kerberos.default.fulluserdomain=CONNSEC.COM
-#last 8Bit crypto for Kerberos web Authentication
-config.support.kerberos.default.crypto=846KZSzYq56M6d5o
-#Kerberos Authentication server RUL
-config.support.kerberos.default.redirecturi=http://login.connsec.com/kerberos/authn/
-############################################################################
-# CAS Login configuration
-############################################################################
-
-config.support.cas.login.url=http://login.connsec.com/cas/login
-#
-config.support.cas.login.service=http://login.connsec.com/maxkey/cas
-#
-config.support.cas.login.validation.url=http://login.connsec.com/cas
-
-############################################################################
-# HTTPHEADER Login configuration
-############################################################################
-
-config.support.httpheader.enable=false
-
-config.support.httpheader.headername=header-user
-
-# iv-user is for IBM Security Access Manager
-#config.httpheader.headername=iv-user
-
-############################################################################
-# BASIC Login support configuration
-############################################################################
-
-config.support.basic.enable=false
-
-#############################################################################
-# WsFederation Login support configuration
-#identifier: the identifer for the ADFS server
-#url: the login url for ADFS
-#principal: the name of the attribute/assertion returned by ADFS that contains the principal's username.
-#relyingParty: the identifier of the CAS Server as it has been configured in ADFS.
-#tolerance: (optional) the amount of drift to allow when validating the timestamp on the token. Default: 10000 (ms)
-#attributeMutator: (optional) a class (defined by you) that can modify the attributes/assertions returned by the ADFS server
-#signingCertificate: ADFS's signing certificate used to validate the token/assertions issued by ADFS.
-############################################################################
-
-config.support.wsfederation.identifier=http://adfs.connsec.com/adfs/services/trust
-config.support.wsfederation.url=https://adfs.connsec.com/adfs/ls/
-config.support.wsfederation.principal=upn
-config.support.wsfederation.relyingParty=urn:federation:connsec
-config.support.wsfederation.signingCertificate=adfs-signing.crt
-config.support.wsfederation.tolerance=10000
-config.support.wsfederation.upn.suffix=connsec.com
-config.support.wsfederation.logoutUrl=https://adfs.connsec.com/adfs/ls/?wa=wsignout1.0
-#############################################################################
-
-#############################################################################
-config.oidc.metadata.issuer=http://login.connsec.com
-config.oidc.metadata.authorizationEndpoint=http://login.connsec.com/maxkey/oauth/v20/authorize
-config.oidc.metadata.tokenEndpoint=http://login.connsec.com/maxkey/oauth/v20/token
-config.oidc.metadata.userinfoEndpoint=http://login.connsec.com/maxkey/api/connect/userinfo
-#############################################################################
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/config/applicationSaml.properties b/maxkey-webs/maxkey-web-maxkey/bin/config/applicationSaml.properties
deleted file mode 100644
index ffa8e74cc..000000000
--- a/maxkey-webs/maxkey-web-maxkey/bin/config/applicationSaml.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
-############################################################################
-# SAML V2.0 configuration
-#saml common
-config.saml.v20.max.parser.pool.size=2
-config.saml.v20.assertion.validity.time.ins.seconds=90
-config.saml.v20.replay.cache.life.in.millis=14400000
-config.saml.v20.issue.instant.check.clock.skew.in.seconds=90
-config.saml.v20.issue.instant.check.validity.time.in.seconds=300
-
-
-#saml idp keystore
-config.saml.v20.idp.keystore.password=connsec
-config.saml.v20.idp.keystore.private.key.password=connsec
-config.saml.v20.idp.keystore=classpath\:config/connsecKeystore.jks
-#keystore id for sec
-config.saml.v20.idp.issuing.entity.id=connsec.com
-config.saml.v20.idp.issuer=https://login.connsec.com/maxkey/saml
-
-config.saml.v20.idp.receiver.endpoint=https\://login.connsec.com/
-
-#saml sp keystore
-config.saml.v20.sp.keystore.password=connsec
-config.saml.v20.sp.keystore.private.key.password=connsec
-config.saml.v20.sp.keystore=classpath\:config/clientKeystore.jks
-config.saml.v20.sp.issuing.entity.id=client.connsec.com
-
-#Saml v20 Metadata
-config.saml.v20.metadata.orgName=connSec
-config.saml.v20.metadata.orgDisplayName=connSec
-config.saml.v20.metadata.orgURL=http://www.connsec.com
-config.saml.v20.metadata.contactType=technical
-config.saml.v20.metadata.company=connSec
-config.saml.v20.metadata.givenName=connSec
-config.saml.v20.metadata.surName=connSec
-config.saml.v20.metadata.emailAddress=admin@connSec.com
-config.saml.v20.metadata.telephoneNumber=4008981111
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/config/applicationSocialSignOn.properties b/maxkey-webs/maxkey-web-maxkey/bin/config/applicationSocialSignOn.properties
deleted file mode 100644
index 72ec92de0..000000000
--- a/maxkey-webs/maxkey-web-maxkey/bin/config/applicationSocialSignOn.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
-############################################################################
-# Social Sign On Configuration #
-#you config client.id & client.secret only
-############################################################################
-
-############################################################################
-#sina weibo
-config.socialsignon.sinaweibo.provider=sinaweibo
-config.socialsignon.sinaweibo.provider.name=\u65B0\u6D6A\u5FAE\u535A
-config.socialsignon.sinaweibo.icon=images/social/sinaweibo.png
-config.socialsignon.sinaweibo.client.id=3379757634
-config.socialsignon.sinaweibo.client.secret=1adfdf9800299037bcab9d1c238664ba
-config.socialsignon.sinaweibo.authorize.url=https://api.weibo.com/oauth2/authorize?client_id=%s&redirect_uri=%s&response_type=code
-config.socialsignon.sinaweibo.accesstoken.url=https://api.weibo.com/oauth2/access_token
-config.socialsignon.sinaweibo.accesstoken.method=POST
-config.socialsignon.sinaweibo.scope=all
-config.socialsignon.sinaweibo.verifier.code=code
-config.socialsignon.sinaweibo.account.url=https://api.weibo.com/2/users/show.json
-config.socialsignon.sinaweibo.account.id=id
-config.socialsignon.sinaweibo.sortorder=1
-
-#Google
-config.socialsignon.google.provider=google
-config.socialsignon.google.provider.name=Google
-config.socialsignon.google.icon=images/social/google.png
-config.socialsignon.google.client.id=519914515488.apps.googleusercontent.com
-config.socialsignon.google.client.secret=3aTW3Iw7e11QqMnHxciCaXTt
-config.socialsignon.google.authorize.url=https://accounts.google.com/o/oauth2/auth?client_id=%s&redirect_uri=%s&response_type=code
-config.socialsignon.google.accesstoken.url=https://accounts.google.com/o/oauth2/token?access_type=offline
-config.socialsignon.google.accesstoken.method=POST
-config.socialsignon.google.scope=openid email profile
-#config.socialsignon.google.scope=https://www.googleapis.com/auth/userinfo.email
-config.socialsignon.google.verifier.code=code
-config.socialsignon.google.account.url=https://www.googleapis.com/plus/v1/people/me
-config.socialsignon.google.account.id=id
-config.socialsignon.google.sortorder=2
-
-#QQ
-config.socialsignon.qq.provider=qq
-config.socialsignon.qq.provider.name=QQ
-config.socialsignon.qq.icon=images/social/qq.png
-config.socialsignon.qq.client.id=101224990
-config.socialsignon.qq.client.secret=09d7481b68d888f01831e3ef7c1c3015
-config.socialsignon.qq.authorize.url=https://graph.qq.com/oauth2.0/authorize?client_id=%s&redirect_uri=%s&response_type=code
-config.socialsignon.qq.accesstoken.url=https://graph.qq.com/oauth2.0/token
-config.socialsignon.qq.accesstoken.method=POST
-config.socialsignon.qq.scope=read
-config.socialsignon.qq.verifier.code=code
-config.socialsignon.qq.account.url=https://graph.qq.com/oauth2.0/me
-config.socialsignon.qq.account.id=openid
-config.socialsignon.qq.sortorder=4
-
-#Windows Live
-config.socialsignon.live.provider=live
-config.socialsignon.live.provider.name=Windows Live
-config.socialsignon.live.icon=images/social/live.png
-config.socialsignon.live.client.id=00000000401129A4
-config.socialsignon.live.client.secret=Kx-OAmHaoqG5vcitm3-TASOSZD1ebu64
-config.socialsignon.live.authorize.url=https://login.live.com/oauth20_authorize.srf?client_id=%s&redirect_uri=%s&response_type=code
-config.socialsignon.live.accesstoken.url=https://login.live.com/oauth20_token.srf
-config.socialsignon.live.accesstoken.method=GET
-config.socialsignon.live.scope=wl.basic
-config.socialsignon.live.verifier.code=code
-config.socialsignon.live.account.url=https://apis.live.net/v5.0/me
-config.socialsignon.live.account.id=id
-config.socialsignon.live.sortorder=5
-
-#facebook
-config.socialsignon.facebook.provider=facebook
-config.socialsignon.facebook.provider.name=facebook
-config.socialsignon.facebook.icon=images/social/facebook.png
-config.socialsignon.facebook.client.id=appKey
-config.socialsignon.facebook.client.secret=appSecret
-config.socialsignon.facebook.authorize.url=https://www.facebook.com/dialog/oauth?client_id=%s&redirect_uri=%s&response_type=code
-config.socialsignon.facebook.accesstoken.url=https://graph.facebook.com/oauth/access_token
-config.socialsignon.facebook.accesstoken.method=GET
-config.socialsignon.facebook.scope=read
-config.socialsignon.facebook.verifier.code=code
-config.socialsignon.facebook.account.url=https://graph.facebook.com/me
-config.socialsignon.facebook.account.id=id
-config.socialsignon.facebook.sortorder=7
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/config/clientKeystore.jks b/maxkey-webs/maxkey-web-maxkey/bin/config/clientKeystore.jks
deleted file mode 100644
index 45d6bf0d9..000000000
Binary files a/maxkey-webs/maxkey-web-maxkey/bin/config/clientKeystore.jks and /dev/null differ
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/config/connsecKeystore.jks b/maxkey-webs/maxkey-web-maxkey/bin/config/connsecKeystore.jks
deleted file mode 100644
index 7fef7c6dc..000000000
Binary files a/maxkey-webs/maxkey-web-maxkey/bin/config/connsecKeystore.jks and /dev/null differ
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/config/keystore.jwks b/maxkey-webs/maxkey-web-maxkey/bin/config/keystore.jwks
deleted file mode 100644
index e9f891e43..000000000
--- a/maxkey-webs/maxkey-web-maxkey/bin/config/keystore.jwks
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "keys":
- [
- {
- "d": "envdv35_HU48wXPivE5qTFwILhCibDz6aZflcNYu58M0lfSNdererwsqkBaDB2Ai8Nv4ZCDSeP4wvvVztJy-KtK422i9kLKvQsvt4zdtFnmhT_aSBEp3FyMPEL1OX9nUixkw8_kMc2o-aCWPDTVucfBWlWxEGRdgDR_nH56Ywwk",
- "e": "AQAB",
- "n": "h5xtDWLssoj5-WLCKPYPUDJlM5pnL4pS8-wMt9sVA57QVRVFdpWHi1dbDCugCApjvmD-giO5yjF5mQSTAF6a14FvktozVw_dDTEzrjG5FgT6WpMzMZd6JpiwQLOtEbV7oBkKYWm1vh1C67-xTlhKgQUNLVNDg4RqRcKFxZd5JPc",
- "kty": "RSA",
- "alg": "RS256",
- "kid": "connsec_rsa"
- }
- ]
-}
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/log4j.properties b/maxkey-webs/maxkey-web-maxkey/bin/log4j.properties
deleted file mode 100644
index 8c2c06676..000000000
--- a/maxkey-webs/maxkey-web-maxkey/bin/log4j.properties
+++ /dev/null
@@ -1,72 +0,0 @@
-# General Log Settings
-#log4j.rootLogger=INFO,LOGFILE,stdout
-log4j.rootLogger=INFO,LOGFILE,stdout
-
-#appender config:stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%c:%p %X %L] %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%-d{HH:mm:ss.SSS} [%c:%p %X{$UserName$} %L] %m%n
-
-#appender config:LOGFILE
-# log file arrcoss file size
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-#log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.LOGFILE.DatePattern=.yyyy-MM-dd
-log4j.appender.LOGFILE.File=${catalina.home}/logs/connsec-maxkey-out.log
-log4j.appender.LOGFILE.maxFileSize=2048KB
-log4j.appender.LOGFILE.MaxBackupIndex = 5
-
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%c:%p] %m%n
-
-log4j.appender.DEBUG=org.apache.log4j.RollingFileAppender
-log4j.appender.DEBUG.File=${catalina.home}/logs/connsec-maxkey-debug.log
-log4j.appender.DEBUG.maxFileSize=2048KB
-log4j.appender.DEBUG.MaxBackupIndex = 5
-log4j.appender.DEBUG.DatePattern=.yyyy-MM-dd
-log4j.appender.DEBUG.layout=org.apache.log4j.PatternLayout
-log4j.appender.DEBUG.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-#log4j.appender.ERROR=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.ERROR.DatePattern=.yyyy-MM-dd
-log4j.appender.ERROR=org.apache.log4j.RollingFileAppender
-log4j.appender.ERROR.File=${catalina.home}/logs/connsec-maxkey-error.log
-
-log4j.appender.ERROR.maxFileSize=2048KB
-log4j.appender.ERROR.MaxBackupIndex = 5
-
-log4j.appender.ERROR.layout=org.apache.log4j.PatternLayout
-log4j.appender.ERROR.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-# spring
-log4j.logger.org.springframework=INFO
-log4j.logger.org.springframework.aop.framework=INFO
-log4j.logger.org.springframework.transaction=INFO
-log4j.logger.org.springframework.transaction.support=INFO
-#mybatis
-log4j.logger.org.mybatis=INFO
-log4j.logger.org.apache.ibatis=INFO
-#opensaml
-log4j.logger.org.opensaml=INFO
-#java.sql
-log4j.logger.java.sql=DEBUG
-log4j.logger.java.sql.Connection=DEBUG
-log4j.logger.java.sql.Statement=DEBUG
-log4j.logger.java.sql.PreparedStatement=DEBUG
-log4j.logger.java.sql.ResultSet=DEBUG
-#com.connsec
-log4j.logger.com.connsec.i18n=INFO
-log4j.logger.com.connsec.web.Application=INFO
-log4j.logger.com.connsec.web.interceptor=DEBUG
-log4j.logger.org.springframework.security.extensions=INFO
-log4j.logger.com.connsec.web.tag=INFO
-log4j.logger.com.connsec.web.WebContext=INFO
-log4j.logger.com.connsec=INFO
-log4j.logger.com.connsec.db=INFO
-log4j.logger.com.connsec.otp=DEBUG
-log4j.logger.com.connsec.db.persistence=TRACE
-log4j.logger.com.connsec.dao.persistence=TRACE
-log4j.logger.com.connsec.dao.service=DEBUG
-#mchange
-log4j.logger.com.mchange=INFO
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/log4jdebug.properties b/maxkey-webs/maxkey-web-maxkey/bin/log4jdebug.properties
deleted file mode 100644
index 75947de80..000000000
--- a/maxkey-webs/maxkey-web-maxkey/bin/log4jdebug.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-# General Log Settings
-#log4j.rootLogger=INFO,LOGFILE,stdout
-log4j.rootLogger=DEBUG,LOGFILE,stdout
-
-#appender config:stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%c:%p %X %L] %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%-d{HH:mm:ss.SSS} [%c:%p %X{$UserName$} %L] %m%n
-
-#appender config:LOGFILE
-# log file arrcoss file size
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-#log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.LOGFILE.DatePattern=.yyyy-MM-dd
-log4j.appender.LOGFILE.File=${catalina.home}/logs/connsec-sec-out.log
-log4j.appender.LOGFILE.maxFileSize=2048KB
-log4j.appender.LOGFILE.MaxBackupIndex = 5
-
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%c:%p] %m%n
-
-log4j.appender.DEBUG=org.apache.log4j.RollingFileAppender
-log4j.appender.DEBUG.File=${catalina.home}/logs/connsec-sec-debug.log
-log4j.appender.DEBUG.maxFileSize=2048KB
-log4j.appender.DEBUG.MaxBackupIndex = 5
-log4j.appender.DEBUG.DatePattern=.yyyy-MM-dd
-log4j.appender.DEBUG.layout=org.apache.log4j.PatternLayout
-log4j.appender.DEBUG.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-#log4j.appender.ERROR=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.ERROR.DatePattern=.yyyy-MM-dd
-log4j.appender.ERROR=org.apache.log4j.RollingFileAppender
-log4j.appender.ERROR.File=${catalina.home}/logs/connsec-sec-error.log
-
-log4j.appender.ERROR.maxFileSize=2048KB
-log4j.appender.ERROR.MaxBackupIndex = 5
-
-log4j.appender.ERROR.layout=org.apache.log4j.PatternLayout
-log4j.appender.ERROR.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-# spring
-log4j.logger.org.springframework=INFO
-log4j.logger.org.springframework.aop.framework=INFO
-log4j.logger.org.springframework.transaction=INFO
-log4j.logger.org.springframework.transaction.support=INFO
-#mybatis
-log4j.logger.org.mybatis=DEBUG
-log4j.logger.org.apache.ibatis=DEBUG
-#java.sql
-log4j.logger.java.sql=DEBUG
-log4j.logger.java.sql.Connection=DEBUG
-log4j.logger.java.sql.Statement=DEBUG
-log4j.logger.java.sql.PreparedStatement=DEBUG
-log4j.logger.java.sql.ResultSet=DEBUG
-#com.connsec
-log4j.logger.com.connsec.i18n=INFO
-log4j.logger.com.connsec.web.Application=INFO
-log4j.logger.com.connsec.web.interceptor=DEBUG
-log4j.logger.com.connsec.web.tag=INFO
-log4j.logger.com.connsec=DEBUG
-log4j.logger.com.connsec.db=DEBUG
-log4j.logger.com.connsec.db.persistence=TRACE
-log4j.logger.com.connsec.dao.persistence=TRACE
-log4j.logger.com.connsec.dao.service=DEBUG
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/log4jinfo.properties b/maxkey-webs/maxkey-web-maxkey/bin/log4jinfo.properties
deleted file mode 100644
index ce53992e4..000000000
--- a/maxkey-webs/maxkey-web-maxkey/bin/log4jinfo.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-# General Log Settings
-#log4j.rootLogger=INFO,LOGFILE,stdout
-log4j.rootLogger=INFO,LOGFILE,stdout
-
-#appender config:stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%c:%p %X %L] %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%-d{HH:mm:ss.SSS} [%c:%p %X{$UserName$} %L] %m%n
-
-#appender config:LOGFILE
-# log file arrcoss file size
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-#log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.LOGFILE.DatePattern=.yyyy-MM-dd
-log4j.appender.LOGFILE.File=${catalina.home}/logs/connsec-sec-out.log
-log4j.appender.LOGFILE.maxFileSize=2048KB
-log4j.appender.LOGFILE.MaxBackupIndex = 5
-
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%c:%p] %m%n
-
-log4j.appender.DEBUG=org.apache.log4j.RollingFileAppender
-log4j.appender.DEBUG.File=${catalina.home}/logs/connsec-sec-debug.log
-log4j.appender.DEBUG.maxFileSize=2048KB
-log4j.appender.DEBUG.MaxBackupIndex = 5
-log4j.appender.DEBUG.DatePattern=.yyyy-MM-dd
-log4j.appender.DEBUG.layout=org.apache.log4j.PatternLayout
-log4j.appender.DEBUG.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-#log4j.appender.ERROR=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.ERROR.DatePattern=.yyyy-MM-dd
-log4j.appender.ERROR=org.apache.log4j.RollingFileAppender
-log4j.appender.ERROR.File=${catalina.home}/logs/connsec-sec-error.log
-
-log4j.appender.ERROR.maxFileSize=2048KB
-log4j.appender.ERROR.MaxBackupIndex = 5
-
-log4j.appender.ERROR.layout=org.apache.log4j.PatternLayout
-log4j.appender.ERROR.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-# spring
-log4j.logger.org.springframework=INFO
-log4j.logger.org.springframework.aop.framework=INFO
-log4j.logger.org.springframework.transaction=INFO
-log4j.logger.org.springframework.transaction.support=INFO
-log4j.logger.org.springframework.security.extensions=INFO
-#mybatis
-log4j.logger.org.mybatis=INFO
-log4j.logger.org.apache.ibatis=INFO
-#java.sql
-log4j.logger.java.sql=DEBUG
-log4j.logger.java.sql.Connection=DEBUG
-log4j.logger.java.sql.Statement=DEBUG
-log4j.logger.java.sql.PreparedStatement=DEBUG
-log4j.logger.java.sql.ResultSet=DEBUG
-#com.connsec
-log4j.logger.com.connsec.i18n=INFO
-log4j.logger.com.connsec.web.Application=INFO
-log4j.logger.com.connsec.web.interceptor=DEBUG
-log4j.logger.com.connsec.web.tag=INFO
-log4j.logger.com.connsec=DEBUG
-log4j.logger.com.connsec.db=DEBUG
-log4j.logger.com.connsec.db.persistence=TRACE
-log4j.logger.com.connsec.dao.persistence=TRACE
-log4j.logger.com.connsec.dao.service=DEBUG
diff --git a/maxkey-demos/maxkey-demo-ltpa/build/tmp/war/MANIFEST.MF b/maxkey-webs/maxkey-web-maxkey/bin/main/META-INF/MANIFEST.MF
similarity index 100%
rename from maxkey-demos/maxkey-demo-ltpa/build/tmp/war/MANIFEST.MF
rename to maxkey-webs/maxkey-web-maxkey/bin/main/META-INF/MANIFEST.MF
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/config/adfs-signing.crt b/maxkey-webs/maxkey-web-maxkey/bin/main/config/adfs-signing.crt
similarity index 100%
rename from maxkey-webs/maxkey-web-maxkey/bin/config/adfs-signing.crt
rename to maxkey-webs/maxkey-web-maxkey/bin/main/config/adfs-signing.crt
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/config/applicationConfig.properties b/maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationConfig.properties
similarity index 91%
rename from maxkey-webs/maxkey-web-maxkey/bin/config/applicationConfig.properties
rename to maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationConfig.properties
index c1a356917..11d1c6bee 100644
--- a/maxkey-webs/maxkey-web-maxkey/bin/config/applicationConfig.properties
+++ b/maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationConfig.properties
@@ -1,10 +1,5 @@
############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
+# MaxKey
############################################################################
# DataBase configuration
############################################################################
diff --git a/maxkey-webs/maxkey-web-maxkey/build/resources/main/config/applicationLogin.properties b/maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationLogin.properties
similarity index 87%
rename from maxkey-webs/maxkey-web-maxkey/build/resources/main/config/applicationLogin.properties
rename to maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationLogin.properties
index 6a4d46fe8..cf60612b9 100644
--- a/maxkey-webs/maxkey-web-maxkey/build/resources/main/config/applicationLogin.properties
+++ b/maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationLogin.properties
@@ -1,13 +1,8 @@
############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
+# MaxKey
############################################################################
# domain name configuration
-config.domain.name=login.connsec.com
+config.domain.name=sso.maxkey.org
config.server.name=http://${config.domain.name}
config.server.prefix=${config.server.name}/maxkey
############################################################################
@@ -45,16 +40,16 @@ config.support.kerberos.default.fulluserdomain=CONNSEC.COM
#last 8Bit crypto for Kerberos web Authentication
config.support.kerberos.default.crypto=846KZSzYq56M6d5o
#Kerberos Authentication server RUL
-config.support.kerberos.default.redirecturi=http://login.connsec.com/kerberos/authn/
+config.support.kerberos.default.redirecturi=http://sso.maxkey.org/kerberos/authn/
############################################################################
# CAS Login configuration
############################################################################
-config.support.cas.login.url=http://login.connsec.com/cas/login
+config.support.cas.login.url=http://sso.maxkey.org/cas/login
#
-config.support.cas.login.service=http://login.connsec.com/maxkey/cas
+config.support.cas.login.service=http://sso.maxkey.org/maxkey/cas
#
-config.support.cas.login.validation.url=http://login.connsec.com/cas
+config.support.cas.login.validation.url=http://sso.maxkey.org/cas
############################################################################
# HTTPHEADER Login configuration
diff --git a/maxkey-webs/maxkey-web-maxkey/build/resources/main/config/applicationSaml.properties b/maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationSaml.properties
similarity index 67%
rename from maxkey-webs/maxkey-web-maxkey/build/resources/main/config/applicationSaml.properties
rename to maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationSaml.properties
index ffa8e74cc..cecaf58b3 100644
--- a/maxkey-webs/maxkey-web-maxkey/build/resources/main/config/applicationSaml.properties
+++ b/maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationSaml.properties
@@ -1,10 +1,5 @@
############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
+# MaxKey
############################################################################
# SAML V2.0 configuration
#saml common
@@ -32,12 +27,12 @@ config.saml.v20.sp.keystore=classpath\:config/clientKeystore.jks
config.saml.v20.sp.issuing.entity.id=client.connsec.com
#Saml v20 Metadata
-config.saml.v20.metadata.orgName=connSec
-config.saml.v20.metadata.orgDisplayName=connSec
-config.saml.v20.metadata.orgURL=http://www.connsec.com
+config.saml.v20.metadata.orgName=maxkey
+config.saml.v20.metadata.orgDisplayName=maxkey
+config.saml.v20.metadata.orgURL=http://www.maxkey.org
config.saml.v20.metadata.contactType=technical
-config.saml.v20.metadata.company=connSec
-config.saml.v20.metadata.givenName=connSec
-config.saml.v20.metadata.surName=connSec
-config.saml.v20.metadata.emailAddress=admin@connSec.com
+config.saml.v20.metadata.company=maxkey
+config.saml.v20.metadata.givenName=maxkey
+config.saml.v20.metadata.surName=maxkey
+config.saml.v20.metadata.emailAddress=admin@maxkey.com
config.saml.v20.metadata.telephoneNumber=4008981111
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/build/resources/main/config/applicationSocialSignOn.properties b/maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationSocialSignOn.properties
similarity index 94%
rename from maxkey-webs/maxkey-web-maxkey/build/resources/main/config/applicationSocialSignOn.properties
rename to maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationSocialSignOn.properties
index 72ec92de0..a36948c7b 100644
--- a/maxkey-webs/maxkey-web-maxkey/build/resources/main/config/applicationSocialSignOn.properties
+++ b/maxkey-webs/maxkey-web-maxkey/bin/main/config/applicationSocialSignOn.properties
@@ -1,10 +1,5 @@
############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
+# MaxKey
############################################################################
# Social Sign On Configuration #
#you config client.id & client.secret only
diff --git a/maxkey-webs/maxkey-web-manage/build/resources/main/config/clientKeystore.jks b/maxkey-webs/maxkey-web-maxkey/bin/main/config/clientKeystore.jks
similarity index 100%
rename from maxkey-webs/maxkey-web-manage/build/resources/main/config/clientKeystore.jks
rename to maxkey-webs/maxkey-web-maxkey/bin/main/config/clientKeystore.jks
diff --git a/maxkey-webs/maxkey-web-manage/build/resources/main/config/connsecKeystore.jks b/maxkey-webs/maxkey-web-maxkey/bin/main/config/connsecKeystore.jks
similarity index 100%
rename from maxkey-webs/maxkey-web-manage/build/resources/main/config/connsecKeystore.jks
rename to maxkey-webs/maxkey-web-maxkey/bin/main/config/connsecKeystore.jks
diff --git a/maxkey-webs/maxkey-web-manage/build/resources/main/config/keystore.jwks b/maxkey-webs/maxkey-web-maxkey/bin/main/config/keystore.jwks
similarity index 100%
rename from maxkey-webs/maxkey-web-manage/build/resources/main/config/keystore.jwks
rename to maxkey-webs/maxkey-web-maxkey/bin/main/config/keystore.jwks
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/main/log4j2.xml b/maxkey-webs/maxkey-web-maxkey/bin/main/log4j2.xml
new file mode 100644
index 000000000..397ac9f9b
--- /dev/null
+++ b/maxkey-webs/maxkey-web-maxkey/bin/main/log4j2.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/bin/main/messages/message.properties b/maxkey-webs/maxkey-web-maxkey/bin/main/messages/message.properties
new file mode 100644
index 000000000..55f2979ed
--- /dev/null
+++ b/maxkey-webs/maxkey-web-maxkey/bin/main/messages/message.properties
@@ -0,0 +1,56 @@
+global.access.application=MaxKey\u5E94\u7528\u5B89\u5168\u7CFB\u7EDF
+global.change.language=\u8BED\u97F3\u9009\u62E9
+global.change.language.en=\u82F1\u6587
+global.change.language.zh=\u4E2D\u6587
+global.text.welcome=\u6B22\u8FCE\u60A8
+global.text.manage=\u7BA1\u7406
+global.text.copyright=\u7248\u6743\u6240\u6709
+global.text.copyright.content=shimingxy@163.com
+global.text.logout=\u9000\u51FA
+global.logout.tip=\u6CE8\u9500\u6210\u529F
+global.logout.text.suffix=\u91CD\u65B0\u767B\u5F55
+global.logout.text.prefix=\u60A8\u5DF2\u7ECF\u6210\u529F\u9000\u51FA\u767B\u5F55\uFF0C\u8BF7\u5173\u95ED\u6D4F\u89C8\u5668\u6216\u8005
+global.session.timeout.tip=\u767B\u5F55\u4F1A\u8BDD\u8D85\u65F6
+global.session.timeout.prefix=\u60A8\u7684\u767B\u5F55\u4F1A\u8BDD\u5DF2\u7ECF\u8D85\u65F6\uFF0C\u8BF7
+global.session.timeout.suffix=\u91CD\u65B0\u767B\u5F55
+
+common.window.title=\u7A97\u53E3
+common.alert.title=\u63D0\u793A\u4FE1\u606F
+common.alert.closeText=\u5173\u95ED
+common.conform.title=\u786E\u8BA4\u63D0\u793A
+common.conform.yes=\u786E\u5B9A
+common.conform.no=\u5173\u95ED
+common.select.hintText=\u8BF7\u9009\u62E9\u60A8\u8981\u64CD\u4F5C\u7684\u6570\u636E
+common.delete.hintText=\u60A8\u786E\u5B9A\u8981\u5220\u9664\u5417?
+common.grid.loadtext=\u6B63\u5728\u52A0\u8F7D...
+common.grid.loadnodata=\u6CA1\u6709\u67E5\u8BE2\u5230\u7B26\u5408\u6570\u636E
+common.submit.hintText=\u60A8\u786E\u5B9A\u8981\u8FDB\u884C\u6B64\u9879\u64CD\u4F5C\u5417?
+common.submit.errorText=\u6267\u884C\u64CD\u4F5C\u5931\u8D25
+
+
+login.text.login.twofactor.obtain.valid=\u91CD\u65B0\u83B7\u53D6
+login.text.login.twofactor.obtain=\u83B7\u53D6\u52A8\u6001\u9A8C\u8BC1\u7801
+login.text.login.twofactor.obtain.valid.unit=\u79D2
+login.text.login.twofactor.validTime=\u5269\u4F59\u65F6\u95F4
+login.text.login.twofactor.validTime.unit=\u79D2
+login.text.login.twofactor=\u5B89\u5168\u8BA4\u8BC1
+login.text.login.normal=\u57FA\u672C\u8BA4\u8BC1
+login.text.username=\u7528\u6237\u540D
+login.text.password=\u5BC6 \u7801
+login.text.captcha=\u9A8C\u8BC1\u7801
+login.text.remeberme=\u8BB0\u4F4F\u767B\u5F55
+login.text.forgotpassword=\u5FD8\u8BB0\u5BC6\u7801
+login.button.login=\u767B\u5F55
+login.text.currenttime=\u65F6 \u95F4
+login.text.otherlogins=\u5176\u4ED6\u767B\u5F55\u65B9\u5F0F
+login.text.register=\u7528\u6237\u6CE8\u518C
+
+
+
+apps.icon=\u56FE\u6807
+apps.name=\u5E94\u7528\u540D\u79F0
+apps.protocol=\u8BBF\u95EE\u534F\u8BAE
+apps.category=\u7C7B\u578B
+button.text.action=\u8BBF\u95EE
+button.text.visit=\u8BBF\u95EE
+
diff --git a/maxkey-webs/maxkey-web-maxkey/build.gradle b/maxkey-webs/maxkey-web-maxkey/build.gradle
index 410071171..0b6c68dc1 100644
--- a/maxkey-webs/maxkey-web-maxkey/build.gradle
+++ b/maxkey-webs/maxkey-web-maxkey/build.gradle
@@ -23,16 +23,7 @@ dependencies {
"org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
//local jars
- compile fileTree(dir: '../maxkey-lib/spring/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/apache/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/db/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/common/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/opensaml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/xml/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/json/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/log/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/java/', include: '*.jar')
- compile fileTree(dir: '../maxkey-lib/other/', include: '*.jar')
+ compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar')
compile project(":maxkey-core")
compile project(":maxkey-dao")
diff --git a/maxkey-webs/maxkey-web-maxkey/build/libs/maxkey-web-maxkey-3.0.0.RELEASE.war b/maxkey-webs/maxkey-web-maxkey/build/libs/maxkey-web-maxkey-3.0.0.RELEASE.war
deleted file mode 100644
index 7514e07a1..000000000
Binary files a/maxkey-webs/maxkey-web-maxkey/build/libs/maxkey-web-maxkey-3.0.0.RELEASE.war and /dev/null differ
diff --git a/maxkey-webs/maxkey-web-maxkey/build/reports/tests/test/css/base-style.css b/maxkey-webs/maxkey-web-maxkey/build/reports/tests/test/css/base-style.css
deleted file mode 100644
index 4afa73e3d..000000000
--- a/maxkey-webs/maxkey-web-maxkey/build/reports/tests/test/css/base-style.css
+++ /dev/null
@@ -1,179 +0,0 @@
-
-body {
- margin: 0;
- padding: 0;
- font-family: sans-serif;
- font-size: 12pt;
-}
-
-body, a, a:visited {
- color: #303030;
-}
-
-#content {
- padding-left: 50px;
- padding-right: 50px;
- padding-top: 30px;
- padding-bottom: 30px;
-}
-
-#content h1 {
- font-size: 160%;
- margin-bottom: 10px;
-}
-
-#footer {
- margin-top: 100px;
- font-size: 80%;
- white-space: nowrap;
-}
-
-#footer, #footer a {
- color: #a0a0a0;
-}
-
-#line-wrapping-toggle {
- vertical-align: middle;
-}
-
-#label-for-line-wrapping-toggle {
- vertical-align: middle;
-}
-
-ul {
- margin-left: 0;
-}
-
-h1, h2, h3 {
- white-space: nowrap;
-}
-
-h2 {
- font-size: 120%;
-}
-
-ul.tabLinks {
- padding-left: 0;
- padding-top: 10px;
- padding-bottom: 10px;
- overflow: auto;
- min-width: 800px;
- width: auto !important;
- width: 800px;
-}
-
-ul.tabLinks li {
- float: left;
- height: 100%;
- list-style: none;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 5px;
- padding-bottom: 5px;
- margin-bottom: 0;
- -moz-border-radius: 7px;
- border-radius: 7px;
- margin-right: 25px;
- border: solid 1px #d4d4d4;
- background-color: #f0f0f0;
-}
-
-ul.tabLinks li:hover {
- background-color: #fafafa;
-}
-
-ul.tabLinks li.selected {
- background-color: #c5f0f5;
- border-color: #c5f0f5;
-}
-
-ul.tabLinks a {
- font-size: 120%;
- display: block;
- outline: none;
- text-decoration: none;
- margin: 0;
- padding: 0;
-}
-
-ul.tabLinks li h2 {
- margin: 0;
- padding: 0;
-}
-
-div.tab {
-}
-
-div.selected {
- display: block;
-}
-
-div.deselected {
- display: none;
-}
-
-div.tab table {
- min-width: 350px;
- width: auto !important;
- width: 350px;
- border-collapse: collapse;
-}
-
-div.tab th, div.tab table {
- border-bottom: solid #d0d0d0 1px;
-}
-
-div.tab th {
- text-align: left;
- white-space: nowrap;
- padding-left: 6em;
-}
-
-div.tab th:first-child {
- padding-left: 0;
-}
-
-div.tab td {
- white-space: nowrap;
- padding-left: 6em;
- padding-top: 5px;
- padding-bottom: 5px;
-}
-
-div.tab td:first-child {
- padding-left: 0;
-}
-
-div.tab td.numeric, div.tab th.numeric {
- text-align: right;
-}
-
-span.code {
- display: inline-block;
- margin-top: 0em;
- margin-bottom: 1em;
-}
-
-span.code pre {
- font-size: 11pt;
- padding-top: 10px;
- padding-bottom: 10px;
- padding-left: 10px;
- padding-right: 10px;
- margin: 0;
- background-color: #f7f7f7;
- border: solid 1px #d0d0d0;
- min-width: 700px;
- width: auto !important;
- width: 700px;
-}
-
-span.wrapped pre {
- word-wrap: break-word;
- white-space: pre-wrap;
- word-break: break-all;
-}
-
-label.hidden {
- display: none;
-}
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/build/reports/tests/test/css/style.css b/maxkey-webs/maxkey-web-maxkey/build/reports/tests/test/css/style.css
deleted file mode 100644
index 3dc4913e7..000000000
--- a/maxkey-webs/maxkey-web-maxkey/build/reports/tests/test/css/style.css
+++ /dev/null
@@ -1,84 +0,0 @@
-
-#summary {
- margin-top: 30px;
- margin-bottom: 40px;
-}
-
-#summary table {
- border-collapse: collapse;
-}
-
-#summary td {
- vertical-align: top;
-}
-
-.breadcrumbs, .breadcrumbs a {
- color: #606060;
-}
-
-.infoBox {
- width: 110px;
- padding-top: 15px;
- padding-bottom: 15px;
- text-align: center;
-}
-
-.infoBox p {
- margin: 0;
-}
-
-.counter, .percent {
- font-size: 120%;
- font-weight: bold;
- margin-bottom: 8px;
-}
-
-#duration {
- width: 125px;
-}
-
-#successRate, .summaryGroup {
- border: solid 2px #d0d0d0;
- -moz-border-radius: 10px;
- border-radius: 10px;
-}
-
-#successRate {
- width: 140px;
- margin-left: 35px;
-}
-
-#successRate .percent {
- font-size: 180%;
-}
-
-.success, .success a {
- color: #008000;
-}
-
-div.success, #successRate.success {
- background-color: #bbd9bb;
- border-color: #008000;
-}
-
-.failures, .failures a {
- color: #b60808;
-}
-
-.skipped, .skipped a {
- color: #c09853;
-}
-
-div.failures, #successRate.failures {
- background-color: #ecdada;
- border-color: #b60808;
-}
-
-ul.linkList {
- padding-left: 0;
-}
-
-ul.linkList li {
- list-style: none;
- margin-bottom: 5px;
-}
diff --git a/maxkey-webs/maxkey-web-maxkey/build/reports/tests/test/index.html b/maxkey-webs/maxkey-web-maxkey/build/reports/tests/test/index.html
deleted file mode 100644
index 5828e1fcc..000000000
--- a/maxkey-webs/maxkey-web-maxkey/build/reports/tests/test/index.html
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-Test results - Test Summary
-
-
Test Summary
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Classes
-
-
-
-Class
-Tests
-Failures
-Ignored
-Duration
-Success rate
-
-
-
-
-
-
-
authzException=new HashMap();
- authzException.put(OAuth2Exception.ERROR, e.getOAuth2ErrorCode());
- authzException.put(OAuth2Exception.DESCRIPTION,e.getMessage());
- return JsonUtils.object2Json(authzException);
- }
- }
-
-
- @RequestMapping(value="/connect/v10/userinfo",produces="text/plain;charset=UTF-8")
- @ResponseBody
- public String apiConnect10aUserInfo(
- @RequestHeader(value = "Authorization", required = true) String access_token) {
- String principal="";
- if (!StringGenerator.uuidMatches(access_token)) {
- return accessTokenFormatError(access_token);
- }
- OAuth2Authentication oAuth2Authentication =null;
- try{
- oAuth2Authentication = oauth20tokenServices.loadAuthentication(access_token);
-
- principal=oAuth2Authentication.getPrincipal().toString();
-
- Setscopes=oAuth2Authentication.getOAuth2Request().getScope();
- ClientDetails clientDetails = clientDetailsService.loadClientByClientId(oAuth2Authentication.getOAuth2Request().getClientId());
-
- UserInfo userInfo=queryUserInfo(principal);
- String userJson="";
- HashMap claimsFields = new HashMap();
-
- claimsFields.put("sub", userInfo.getId());
-
- if(scopes.contains("profile")){
- claimsFields.put("name", userInfo.getUsername());
- claimsFields.put("preferred_username", userInfo.getDisplayName());
- claimsFields.put("given_name", userInfo.getGivenName());
- claimsFields.put("family_name", userInfo.getFamilyName());
- claimsFields.put("middle_name", userInfo.getMiddleName());
- claimsFields.put("nickname", userInfo.getNickName());
- claimsFields.put("profile", "profile");
- claimsFields.put("picture", "picture");
- claimsFields.put("website", userInfo.getWebSite());
-
- String gender;
- switch(userInfo.getGender()){
- case UserInfo.GENDER.MALE :
- gender="male";break;
- case UserInfo.GENDER.FEMALE :
- gender="female";break;
- default:
- gender="unknown";
- }
- claimsFields.put("gender", gender);
- claimsFields.put("zoneinfo", userInfo.getTimeZone());
- claimsFields.put("locale", userInfo.getLocale());
- claimsFields.put("updated_time", userInfo.getModifiedDate());
- claimsFields.put("birthdate", userInfo.getBirthDate());
- }
-
- if(scopes.contains("email")){
- claimsFields.put("email", userInfo.getWorkEmail());
- claimsFields.put("email_verified", false);
- }
-
- if(scopes.contains("phone")){
- claimsFields.put("phone_number", userInfo.getWorkPhoneNumber());
- claimsFields.put("phone_number_verified", false);
- }
-
- if(scopes.contains("address")){
- HashMap addressFields = new HashMap();
- addressFields.put("country", userInfo.getWorkCountry());
- addressFields.put("region", userInfo.getWorkRegion());
- addressFields.put("locality", userInfo.getWorkLocality());
- addressFields.put("street_address", userInfo.getWorkStreetAddress());
- addressFields.put("formatted", userInfo.getWorkAddressFormatted());
- addressFields.put("postal_code", userInfo.getWorkPostalCode());
-
- claimsFields.put("address", addressFields);
- }
-
- JWTClaimsSet userInfoJWTClaims = new JWTClaimsSet.Builder()
- .jwtID(UUID.randomUUID().toString())// set a random NONCE in the middle of it
- .audience(Arrays.asList(clientDetails.getClientId()))
- .issueTime(new Date())
- .expirationTime(new Date(new Date().getTime()+clientDetails.getAccessTokenValiditySeconds()*1000))
- .claim(claimsFields)
- .build();
-
-
- JWT userInfoJWT=null;
- JWSAlgorithm signingAlg = jwtSignerValidationService.getDefaultSigningAlgorithm();
- if (clientDetails.getUserInfoEncryptedAlgorithm() != null && !clientDetails.getUserInfoEncryptedAlgorithm().equals("none")
- && clientDetails.getUserInfoEncryptionMethod() != null && !clientDetails.getUserInfoEncryptionMethod().equals("none")
- &&clientDetails.getJwksUri()!=null&&clientDetails.getJwksUri().length()>4
- ) {
- JwtEncryptionAndDecryptionService recipientJwtEnDecryptionService =
- recipientJwtEnDecryptionServiceBuilder.serviceBuilder(clientDetails.getJwksUri());
-
- if (recipientJwtEnDecryptionService != null) {
- JWEAlgorithm jweAlgorithm=new JWEAlgorithm(clientDetails.getUserInfoEncryptedAlgorithm());
- EncryptionMethod encryptionMethod=new EncryptionMethod(clientDetails.getUserInfoEncryptionMethod());
- EncryptedJWT encryptedJWT = new EncryptedJWT(new JWEHeader(jweAlgorithm, encryptionMethod), userInfoJWTClaims);
- recipientJwtEnDecryptionService.encryptJwt(encryptedJWT);
- userJson=encryptedJWT.serialize();
- }else{
- _logger.error("Couldn't find encrypter for client: " + clientDetails.getClientId());
- HashMapauthzException=new HashMap();
- authzException.put(OAuth2Exception.ERROR, "error");
- authzException.put(OAuth2Exception.DESCRIPTION,"Couldn't find encrypter for client: " + clientDetails.getClientId());
- return JsonUtils.gson2Json(authzException);
- }
- } else {
- if (clientDetails.getUserInfoSigningAlgorithm()==null||clientDetails.getUserInfoSigningAlgorithm().equals("none")) {
- // unsigned ID token
- //userInfoJWT = new PlainJWT(userInfoJWTClaims);
- userJson=JsonUtils.gson2Json(claimsFields);
- } else {
- // signed ID token
- if (signingAlg.equals(JWSAlgorithm.HS256)
- || signingAlg.equals(JWSAlgorithm.HS384)
- || signingAlg.equals(JWSAlgorithm.HS512)) {
- // sign it with the client's secret
- String client_secret=ReciprocalUtils.decoder(clientDetails.getClientSecret());
-
- JwtSigningAndValidationService symmetricJwtSignerService =symmetricJwtSignerServiceBuilder.serviceBuilder(client_secret);
- if(symmetricJwtSignerService!=null){
- userInfoJWTClaims = new JWTClaimsSet.Builder(userInfoJWTClaims).claim("kid", "SYMMETRIC-KEY").build();
- userInfoJWT = new SignedJWT(new JWSHeader(signingAlg), userInfoJWTClaims);
- symmetricJwtSignerService.signJwt((SignedJWT) userInfoJWT);
- }else{
- _logger.error("Couldn't create symmetric validator for client " + clientDetails.getClientId() + " without a client secret");
- }
- } else {
- userInfoJWTClaims = new JWTClaimsSet.Builder(userInfoJWTClaims).claim("kid", jwtSignerValidationService.getDefaultSignerKeyId()).build();
- userInfoJWT = new SignedJWT(new JWSHeader(signingAlg), userInfoJWTClaims);
- // sign it with the server's key
- jwtSignerValidationService.signJwt((SignedJWT) userInfoJWT);
- }
- userJson=userInfoJWT.serialize();
- }
- }
-
- return userJson;
-
- }catch(OAuth2Exception e){
- HashMapauthzException=new HashMap();
- authzException.put(OAuth2Exception.ERROR, e.getOAuth2ErrorCode());
- authzException.put(OAuth2Exception.DESCRIPTION,e.getMessage());
- return JsonUtils.object2Json(authzException);
- }
- }
-
-
- public String accessTokenFormatError(String access_token){
- HashMapatfe=new HashMap();
- atfe.put(OAuth2Exception.ERROR, "token Format Invalid");
- atfe.put(OAuth2Exception.DESCRIPTION, "access Token Format Invalid , access_token : "+access_token);
-
- return JsonUtils.object2Json(atfe);
- }
-
-
- public UserInfo queryUserInfo(String uid){
- _logger.debug("uid : "+uid);
- UserInfo queryUserInfo=new UserInfo();
- queryUserInfo.setUsername(uid);
- UserInfo userInfo = (UserInfo) userInfoService.load(queryUserInfo);
- return userInfo;
- }
-
-
- public void setOauth20tokenServices(DefaultTokenServices oauth20tokenServices) {
- this.oauth20tokenServices = oauth20tokenServices;
- }
-
-
-
- public void setUserInfoService(UserInfoService userInfoService) {
- this.userInfoService = userInfoService;
- }
-
-
-
- public void setJwtSignerValidationService(
- JwtSigningAndValidationService jwtSignerValidationService) {
- this.jwtSignerValidationService = jwtSignerValidationService;
- }
-
- public void setJwtEnDecryptionService(
- JwtEncryptionAndDecryptionService jwtEnDecryptionService) {
- this.jwtEnDecryptionService = jwtEnDecryptionService;
- }
-}
+//package org.maxkey.web.oauth.userinfo.controller;
+//
+//import java.util.Arrays;
+//import java.util.Date;
+//import java.util.HashMap;
+//import java.util.Set;
+//import java.util.UUID;
+//
+//import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
+//import org.maxkey.authz.oauth2.common.exceptions.OAuth2Exception;
+//import org.maxkey.authz.oauth2.provider.ClientDetailsService;
+//import org.maxkey.authz.oauth2.provider.OAuth2Authentication;
+//import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices;
+//import org.maxkey.constants.BOOLEAN;
+//import org.maxkey.crypto.ReciprocalUtils;
+//import org.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService;
+//import org.maxkey.crypto.jwt.encryption.service.impl.RecipientJwtEncryptionAndDecryptionServiceBuilder;
+//import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService;
+//import org.maxkey.crypto.jwt.signer.service.impl.SymmetricSigningAndValidationServiceBuilder;
+//import org.maxkey.dao.service.ApplicationsService;
+//import org.maxkey.dao.service.UserInfoService;
+//import org.maxkey.domain.UserInfo;
+//import org.maxkey.domain.apps.Applications;
+//import org.maxkey.domain.apps.oauth2.provider.ClientDetails;
+//import org.maxkey.util.Instance;
+//import org.maxkey.util.JsonUtils;
+//import org.maxkey.util.StringGenerator;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.web.bind.annotation.RequestHeader;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.ResponseBody;
+//
+//import com.nimbusds.jose.EncryptionMethod;
+//import com.nimbusds.jose.JWEAlgorithm;
+//import com.nimbusds.jose.JWEHeader;
+//import com.nimbusds.jose.JWSAlgorithm;
+//import com.nimbusds.jose.JWSHeader;
+//import com.nimbusds.jwt.EncryptedJWT;
+//import com.nimbusds.jwt.JWT;
+//import com.nimbusds.jwt.JWTClaimsSet;
+//import com.nimbusds.jwt.SignedJWT;
+//
+//@Controller
+//@RequestMapping(value = { "/api" })
+//public class UserInfoEndpoint {
+// final static Logger _logger = LoggerFactory.getLogger(UserInfoEndpoint.class);
+// @Autowired
+// @Qualifier("oauth20JdbcClientDetailsService")
+// private ClientDetailsService clientDetailsService;
+//
+// @Autowired
+// @Qualifier("oauth20TokenServices")
+// private DefaultTokenServices oauth20tokenServices;
+//
+//
+// @Autowired
+// @Qualifier("userInfoService")
+// private UserInfoService userInfoService;
+//
+// @Autowired
+// @Qualifier("applicationsService")
+// protected ApplicationsService applicationsService;
+//
+// @Autowired
+// @Qualifier("jwtSignerValidationService")
+// private JwtSigningAndValidationService jwtSignerValidationService;
+//
+// @Autowired
+// @Qualifier("jwtEncryptionService")
+// private JwtEncryptionAndDecryptionService jwtEnDecryptionService;
+//
+// private SymmetricSigningAndValidationServiceBuilder symmetricJwtSignerServiceBuilder
+// =new SymmetricSigningAndValidationServiceBuilder();
+//
+// private RecipientJwtEncryptionAndDecryptionServiceBuilder recipientJwtEnDecryptionServiceBuilder
+// =new RecipientJwtEncryptionAndDecryptionServiceBuilder();
+//
+//
+// OAuthDefaultUserInfoAdapter defaultOAuthUserInfoAdapter=new OAuthDefaultUserInfoAdapter();
+//
+// @RequestMapping(value="/oauth/v20/me",produces="text/plain;charset=UTF-8")
+// @ResponseBody
+// public String apiV20UserInfo(
+// @RequestParam(value = "access_token", required = true) String access_token) {
+// String principal="";
+// if (!StringGenerator.uuidMatches(access_token)) {
+// return accessTokenFormatError(access_token);
+// }
+// OAuth2Authentication oAuth2Authentication =null;
+// try{
+// oAuth2Authentication = oauth20tokenServices.loadAuthentication(access_token);
+//
+// principal=oAuth2Authentication.getPrincipal().toString();
+//
+// String client_id= oAuth2Authentication.getOAuth2Request().getClientId();
+// UserInfo userInfo=queryUserInfo(principal);
+// Applications app=applicationsService.get(client_id);
+//
+// String userJson="";
+//
+// AbstractAuthorizeAdapter adapter;
+// if(BOOLEAN.isTrue(app.getIsAdapter())){
+// adapter =(AbstractAuthorizeAdapter)Instance.newInstance(app.getAdapter());
+// }else{
+// adapter =(AbstractAuthorizeAdapter)defaultOAuthUserInfoAdapter;
+// }
+//
+// String jsonData=adapter.generateInfo(userInfo, null);
+// userJson=adapter.sign(jsonData, app);
+//
+// return userJson;
+//
+// }catch(OAuth2Exception e){
+// HashMapauthzException=new HashMap();
+// authzException.put(OAuth2Exception.ERROR, e.getOAuth2ErrorCode());
+// authzException.put(OAuth2Exception.DESCRIPTION,e.getMessage());
+// return JsonUtils.object2Json(authzException);
+// }
+// }
+//
+//
+// @RequestMapping(value="/connect/v10/userinfo",produces="text/plain;charset=UTF-8")
+// @ResponseBody
+// public String apiConnect10aUserInfo(
+// @RequestHeader(value = "Authorization", required = true) String access_token) {
+// String principal="";
+// if (!StringGenerator.uuidMatches(access_token)) {
+// return accessTokenFormatError(access_token);
+// }
+// OAuth2Authentication oAuth2Authentication =null;
+// try{
+// oAuth2Authentication = oauth20tokenServices.loadAuthentication(access_token);
+//
+// principal=oAuth2Authentication.getPrincipal().toString();
+//
+// Setscopes=oAuth2Authentication.getOAuth2Request().getScope();
+// ClientDetails clientDetails = clientDetailsService.loadClientByClientId(oAuth2Authentication.getOAuth2Request().getClientId());
+//
+// UserInfo userInfo=queryUserInfo(principal);
+// String userJson="";
+// HashMap claimsFields = new HashMap();
+//
+// claimsFields.put("sub", userInfo.getId());
+//
+// if(scopes.contains("profile")){
+// claimsFields.put("name", userInfo.getUsername());
+// claimsFields.put("preferred_username", userInfo.getDisplayName());
+// claimsFields.put("given_name", userInfo.getGivenName());
+// claimsFields.put("family_name", userInfo.getFamilyName());
+// claimsFields.put("middle_name", userInfo.getMiddleName());
+// claimsFields.put("nickname", userInfo.getNickName());
+// claimsFields.put("profile", "profile");
+// claimsFields.put("picture", "picture");
+// claimsFields.put("website", userInfo.getWebSite());
+//
+// String gender;
+// switch(userInfo.getGender()){
+// case UserInfo.GENDER.MALE :
+// gender="male";break;
+// case UserInfo.GENDER.FEMALE :
+// gender="female";break;
+// default:
+// gender="unknown";
+// }
+// claimsFields.put("gender", gender);
+// claimsFields.put("zoneinfo", userInfo.getTimeZone());
+// claimsFields.put("locale", userInfo.getLocale());
+// claimsFields.put("updated_time", userInfo.getModifiedDate());
+// claimsFields.put("birthdate", userInfo.getBirthDate());
+// }
+//
+// if(scopes.contains("email")){
+// claimsFields.put("email", userInfo.getWorkEmail());
+// claimsFields.put("email_verified", false);
+// }
+//
+// if(scopes.contains("phone")){
+// claimsFields.put("phone_number", userInfo.getWorkPhoneNumber());
+// claimsFields.put("phone_number_verified", false);
+// }
+//
+// if(scopes.contains("address")){
+// HashMap addressFields = new HashMap();
+// addressFields.put("country", userInfo.getWorkCountry());
+// addressFields.put("region", userInfo.getWorkRegion());
+// addressFields.put("locality", userInfo.getWorkLocality());
+// addressFields.put("street_address", userInfo.getWorkStreetAddress());
+// addressFields.put("formatted", userInfo.getWorkAddressFormatted());
+// addressFields.put("postal_code", userInfo.getWorkPostalCode());
+//
+// claimsFields.put("address", addressFields);
+// }
+//
+// JWTClaimsSet userInfoJWTClaims = new JWTClaimsSet.Builder()
+// .jwtID(UUID.randomUUID().toString())// set a random NONCE in the middle of it
+// .audience(Arrays.asList(clientDetails.getClientId()))
+// .issueTime(new Date())
+// .expirationTime(new Date(new Date().getTime()+clientDetails.getAccessTokenValiditySeconds()*1000))
+// .claim(claimsFields)
+// .build();
+//
+//
+// JWT userInfoJWT=null;
+// JWSAlgorithm signingAlg = jwtSignerValidationService.getDefaultSigningAlgorithm();
+// if (clientDetails.getUserInfoEncryptedAlgorithm() != null && !clientDetails.getUserInfoEncryptedAlgorithm().equals("none")
+// && clientDetails.getUserInfoEncryptionMethod() != null && !clientDetails.getUserInfoEncryptionMethod().equals("none")
+// &&clientDetails.getJwksUri()!=null&&clientDetails.getJwksUri().length()>4
+// ) {
+// JwtEncryptionAndDecryptionService recipientJwtEnDecryptionService =
+// recipientJwtEnDecryptionServiceBuilder.serviceBuilder(clientDetails.getJwksUri());
+//
+// if (recipientJwtEnDecryptionService != null) {
+// JWEAlgorithm jweAlgorithm=new JWEAlgorithm(clientDetails.getUserInfoEncryptedAlgorithm());
+// EncryptionMethod encryptionMethod=new EncryptionMethod(clientDetails.getUserInfoEncryptionMethod());
+// EncryptedJWT encryptedJWT = new EncryptedJWT(new JWEHeader(jweAlgorithm, encryptionMethod), userInfoJWTClaims);
+// recipientJwtEnDecryptionService.encryptJwt(encryptedJWT);
+// userJson=encryptedJWT.serialize();
+// }else{
+// _logger.error("Couldn't find encrypter for client: " + clientDetails.getClientId());
+// HashMapauthzException=new HashMap();
+// authzException.put(OAuth2Exception.ERROR, "error");
+// authzException.put(OAuth2Exception.DESCRIPTION,"Couldn't find encrypter for client: " + clientDetails.getClientId());
+// return JsonUtils.gson2Json(authzException);
+// }
+// } else {
+// if (clientDetails.getUserInfoSigningAlgorithm()==null||clientDetails.getUserInfoSigningAlgorithm().equals("none")) {
+// // unsigned ID token
+// //userInfoJWT = new PlainJWT(userInfoJWTClaims);
+// userJson=JsonUtils.gson2Json(claimsFields);
+// } else {
+// // signed ID token
+// if (signingAlg.equals(JWSAlgorithm.HS256)
+// || signingAlg.equals(JWSAlgorithm.HS384)
+// || signingAlg.equals(JWSAlgorithm.HS512)) {
+// // sign it with the client's secret
+// String client_secret=ReciprocalUtils.decoder(clientDetails.getClientSecret());
+//
+// JwtSigningAndValidationService symmetricJwtSignerService =symmetricJwtSignerServiceBuilder.serviceBuilder(client_secret);
+// if(symmetricJwtSignerService!=null){
+// userInfoJWTClaims = new JWTClaimsSet.Builder(userInfoJWTClaims).claim("kid", "SYMMETRIC-KEY").build();
+// userInfoJWT = new SignedJWT(new JWSHeader(signingAlg), userInfoJWTClaims);
+// symmetricJwtSignerService.signJwt((SignedJWT) userInfoJWT);
+// }else{
+// _logger.error("Couldn't create symmetric validator for client " + clientDetails.getClientId() + " without a client secret");
+// }
+// } else {
+// userInfoJWTClaims = new JWTClaimsSet.Builder(userInfoJWTClaims).claim("kid", jwtSignerValidationService.getDefaultSignerKeyId()).build();
+// userInfoJWT = new SignedJWT(new JWSHeader(signingAlg), userInfoJWTClaims);
+// // sign it with the server's key
+// jwtSignerValidationService.signJwt((SignedJWT) userInfoJWT);
+// }
+// userJson=userInfoJWT.serialize();
+// }
+// }
+//
+// return userJson;
+//
+// }catch(OAuth2Exception e){
+// HashMapauthzException=new HashMap();
+// authzException.put(OAuth2Exception.ERROR, e.getOAuth2ErrorCode());
+// authzException.put(OAuth2Exception.DESCRIPTION,e.getMessage());
+// return JsonUtils.object2Json(authzException);
+// }
+// }
+//
+//
+// public String accessTokenFormatError(String access_token){
+// HashMapatfe=new HashMap();
+// atfe.put(OAuth2Exception.ERROR, "token Format Invalid");
+// atfe.put(OAuth2Exception.DESCRIPTION, "access Token Format Invalid , access_token : "+access_token);
+//
+// return JsonUtils.object2Json(atfe);
+// }
+//
+//
+// public UserInfo queryUserInfo(String uid){
+// _logger.debug("uid : "+uid);
+// UserInfo queryUserInfo=new UserInfo();
+// queryUserInfo.setUsername(uid);
+// UserInfo userInfo = (UserInfo) userInfoService.load(queryUserInfo);
+// return userInfo;
+// }
+//
+//
+// public void setOauth20tokenServices(DefaultTokenServices oauth20tokenServices) {
+// this.oauth20tokenServices = oauth20tokenServices;
+// }
+//
+//
+//
+// public void setUserInfoService(UserInfoService userInfoService) {
+// this.userInfoService = userInfoService;
+// }
+//
+//
+//
+// public void setJwtSignerValidationService(
+// JwtSigningAndValidationService jwtSignerValidationService) {
+// this.jwtSignerValidationService = jwtSignerValidationService;
+// }
+//
+// public void setJwtEnDecryptionService(
+// JwtEncryptionAndDecryptionService jwtEnDecryptionService) {
+// this.jwtEnDecryptionService = jwtEnDecryptionService;
+// }
+//}
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties
index c1a356917..11d1c6bee 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties
@@ -1,10 +1,5 @@
############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
+# MaxKey
############################################################################
# DataBase configuration
############################################################################
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties
index 6a4d46fe8..cf60612b9 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties
@@ -1,13 +1,8 @@
############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
+# MaxKey
############################################################################
# domain name configuration
-config.domain.name=login.connsec.com
+config.domain.name=sso.maxkey.org
config.server.name=http://${config.domain.name}
config.server.prefix=${config.server.name}/maxkey
############################################################################
@@ -45,16 +40,16 @@ config.support.kerberos.default.fulluserdomain=CONNSEC.COM
#last 8Bit crypto for Kerberos web Authentication
config.support.kerberos.default.crypto=846KZSzYq56M6d5o
#Kerberos Authentication server RUL
-config.support.kerberos.default.redirecturi=http://login.connsec.com/kerberos/authn/
+config.support.kerberos.default.redirecturi=http://sso.maxkey.org/kerberos/authn/
############################################################################
# CAS Login configuration
############################################################################
-config.support.cas.login.url=http://login.connsec.com/cas/login
+config.support.cas.login.url=http://sso.maxkey.org/cas/login
#
-config.support.cas.login.service=http://login.connsec.com/maxkey/cas
+config.support.cas.login.service=http://sso.maxkey.org/maxkey/cas
#
-config.support.cas.login.validation.url=http://login.connsec.com/cas
+config.support.cas.login.validation.url=http://sso.maxkey.org/cas
############################################################################
# HTTPHEADER Login configuration
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationSaml.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationSaml.properties
index ffa8e74cc..cecaf58b3 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationSaml.properties
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationSaml.properties
@@ -1,10 +1,5 @@
############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
+# MaxKey
############################################################################
# SAML V2.0 configuration
#saml common
@@ -32,12 +27,12 @@ config.saml.v20.sp.keystore=classpath\:config/clientKeystore.jks
config.saml.v20.sp.issuing.entity.id=client.connsec.com
#Saml v20 Metadata
-config.saml.v20.metadata.orgName=connSec
-config.saml.v20.metadata.orgDisplayName=connSec
-config.saml.v20.metadata.orgURL=http://www.connsec.com
+config.saml.v20.metadata.orgName=maxkey
+config.saml.v20.metadata.orgDisplayName=maxkey
+config.saml.v20.metadata.orgURL=http://www.maxkey.org
config.saml.v20.metadata.contactType=technical
-config.saml.v20.metadata.company=connSec
-config.saml.v20.metadata.givenName=connSec
-config.saml.v20.metadata.surName=connSec
-config.saml.v20.metadata.emailAddress=admin@connSec.com
+config.saml.v20.metadata.company=maxkey
+config.saml.v20.metadata.givenName=maxkey
+config.saml.v20.metadata.surName=maxkey
+config.saml.v20.metadata.emailAddress=admin@maxkey.com
config.saml.v20.metadata.telephoneNumber=4008981111
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationSocialSignOn.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationSocialSignOn.properties
index 72ec92de0..a36948c7b 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationSocialSignOn.properties
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/config/applicationSocialSignOn.properties
@@ -1,10 +1,5 @@
############################################################################
-# ConnSec Identity and Access Management
-# MaxKey Version 3.0 GA
-
-# Copyright (c) 2002-2017 ConnSec SoftWare, Inc.
-# We're focus on Cloud Identity and Security
-# http://www.connsec.com
+# MaxKey
############################################################################
# Social Sign On Configuration #
#you config client.id & client.secret only
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4j.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4j.properties
deleted file mode 100644
index 8c2c06676..000000000
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,72 +0,0 @@
-# General Log Settings
-#log4j.rootLogger=INFO,LOGFILE,stdout
-log4j.rootLogger=INFO,LOGFILE,stdout
-
-#appender config:stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%c:%p %X %L] %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%-d{HH:mm:ss.SSS} [%c:%p %X{$UserName$} %L] %m%n
-
-#appender config:LOGFILE
-# log file arrcoss file size
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-#log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.LOGFILE.DatePattern=.yyyy-MM-dd
-log4j.appender.LOGFILE.File=${catalina.home}/logs/connsec-maxkey-out.log
-log4j.appender.LOGFILE.maxFileSize=2048KB
-log4j.appender.LOGFILE.MaxBackupIndex = 5
-
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%c:%p] %m%n
-
-log4j.appender.DEBUG=org.apache.log4j.RollingFileAppender
-log4j.appender.DEBUG.File=${catalina.home}/logs/connsec-maxkey-debug.log
-log4j.appender.DEBUG.maxFileSize=2048KB
-log4j.appender.DEBUG.MaxBackupIndex = 5
-log4j.appender.DEBUG.DatePattern=.yyyy-MM-dd
-log4j.appender.DEBUG.layout=org.apache.log4j.PatternLayout
-log4j.appender.DEBUG.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-#log4j.appender.ERROR=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.ERROR.DatePattern=.yyyy-MM-dd
-log4j.appender.ERROR=org.apache.log4j.RollingFileAppender
-log4j.appender.ERROR.File=${catalina.home}/logs/connsec-maxkey-error.log
-
-log4j.appender.ERROR.maxFileSize=2048KB
-log4j.appender.ERROR.MaxBackupIndex = 5
-
-log4j.appender.ERROR.layout=org.apache.log4j.PatternLayout
-log4j.appender.ERROR.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-# spring
-log4j.logger.org.springframework=INFO
-log4j.logger.org.springframework.aop.framework=INFO
-log4j.logger.org.springframework.transaction=INFO
-log4j.logger.org.springframework.transaction.support=INFO
-#mybatis
-log4j.logger.org.mybatis=INFO
-log4j.logger.org.apache.ibatis=INFO
-#opensaml
-log4j.logger.org.opensaml=INFO
-#java.sql
-log4j.logger.java.sql=DEBUG
-log4j.logger.java.sql.Connection=DEBUG
-log4j.logger.java.sql.Statement=DEBUG
-log4j.logger.java.sql.PreparedStatement=DEBUG
-log4j.logger.java.sql.ResultSet=DEBUG
-#com.connsec
-log4j.logger.com.connsec.i18n=INFO
-log4j.logger.com.connsec.web.Application=INFO
-log4j.logger.com.connsec.web.interceptor=DEBUG
-log4j.logger.org.springframework.security.extensions=INFO
-log4j.logger.com.connsec.web.tag=INFO
-log4j.logger.com.connsec.web.WebContext=INFO
-log4j.logger.com.connsec=INFO
-log4j.logger.com.connsec.db=INFO
-log4j.logger.com.connsec.otp=DEBUG
-log4j.logger.com.connsec.db.persistence=TRACE
-log4j.logger.com.connsec.dao.persistence=TRACE
-log4j.logger.com.connsec.dao.service=DEBUG
-#mchange
-log4j.logger.com.mchange=INFO
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4j2.xml b/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..397ac9f9b
--- /dev/null
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4j2.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4jdebug.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4jdebug.properties
deleted file mode 100644
index 75947de80..000000000
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4jdebug.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-# General Log Settings
-#log4j.rootLogger=INFO,LOGFILE,stdout
-log4j.rootLogger=DEBUG,LOGFILE,stdout
-
-#appender config:stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%c:%p %X %L] %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%-d{HH:mm:ss.SSS} [%c:%p %X{$UserName$} %L] %m%n
-
-#appender config:LOGFILE
-# log file arrcoss file size
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-#log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.LOGFILE.DatePattern=.yyyy-MM-dd
-log4j.appender.LOGFILE.File=${catalina.home}/logs/connsec-sec-out.log
-log4j.appender.LOGFILE.maxFileSize=2048KB
-log4j.appender.LOGFILE.MaxBackupIndex = 5
-
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%c:%p] %m%n
-
-log4j.appender.DEBUG=org.apache.log4j.RollingFileAppender
-log4j.appender.DEBUG.File=${catalina.home}/logs/connsec-sec-debug.log
-log4j.appender.DEBUG.maxFileSize=2048KB
-log4j.appender.DEBUG.MaxBackupIndex = 5
-log4j.appender.DEBUG.DatePattern=.yyyy-MM-dd
-log4j.appender.DEBUG.layout=org.apache.log4j.PatternLayout
-log4j.appender.DEBUG.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-#log4j.appender.ERROR=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.ERROR.DatePattern=.yyyy-MM-dd
-log4j.appender.ERROR=org.apache.log4j.RollingFileAppender
-log4j.appender.ERROR.File=${catalina.home}/logs/connsec-sec-error.log
-
-log4j.appender.ERROR.maxFileSize=2048KB
-log4j.appender.ERROR.MaxBackupIndex = 5
-
-log4j.appender.ERROR.layout=org.apache.log4j.PatternLayout
-log4j.appender.ERROR.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-# spring
-log4j.logger.org.springframework=INFO
-log4j.logger.org.springframework.aop.framework=INFO
-log4j.logger.org.springframework.transaction=INFO
-log4j.logger.org.springframework.transaction.support=INFO
-#mybatis
-log4j.logger.org.mybatis=DEBUG
-log4j.logger.org.apache.ibatis=DEBUG
-#java.sql
-log4j.logger.java.sql=DEBUG
-log4j.logger.java.sql.Connection=DEBUG
-log4j.logger.java.sql.Statement=DEBUG
-log4j.logger.java.sql.PreparedStatement=DEBUG
-log4j.logger.java.sql.ResultSet=DEBUG
-#com.connsec
-log4j.logger.com.connsec.i18n=INFO
-log4j.logger.com.connsec.web.Application=INFO
-log4j.logger.com.connsec.web.interceptor=DEBUG
-log4j.logger.com.connsec.web.tag=INFO
-log4j.logger.com.connsec=DEBUG
-log4j.logger.com.connsec.db=DEBUG
-log4j.logger.com.connsec.db.persistence=TRACE
-log4j.logger.com.connsec.dao.persistence=TRACE
-log4j.logger.com.connsec.dao.service=DEBUG
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4jinfo.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4jinfo.properties
deleted file mode 100644
index ce53992e4..000000000
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/log4jinfo.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-# General Log Settings
-#log4j.rootLogger=INFO,LOGFILE,stdout
-log4j.rootLogger=INFO,LOGFILE,stdout
-
-#appender config:stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%c:%p %X %L] %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%-d{HH:mm:ss.SSS} [%c:%p %X{$UserName$} %L] %m%n
-
-#appender config:LOGFILE
-# log file arrcoss file size
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-#log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.LOGFILE.DatePattern=.yyyy-MM-dd
-log4j.appender.LOGFILE.File=${catalina.home}/logs/connsec-sec-out.log
-log4j.appender.LOGFILE.maxFileSize=2048KB
-log4j.appender.LOGFILE.MaxBackupIndex = 5
-
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} [%c:%p] %m%n
-
-log4j.appender.DEBUG=org.apache.log4j.RollingFileAppender
-log4j.appender.DEBUG.File=${catalina.home}/logs/connsec-sec-debug.log
-log4j.appender.DEBUG.maxFileSize=2048KB
-log4j.appender.DEBUG.MaxBackupIndex = 5
-log4j.appender.DEBUG.DatePattern=.yyyy-MM-dd
-log4j.appender.DEBUG.layout=org.apache.log4j.PatternLayout
-log4j.appender.DEBUG.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-#log4j.appender.ERROR=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.ERROR.DatePattern=.yyyy-MM-dd
-log4j.appender.ERROR=org.apache.log4j.RollingFileAppender
-log4j.appender.ERROR.File=${catalina.home}/logs/connsec-sec-error.log
-
-log4j.appender.ERROR.maxFileSize=2048KB
-log4j.appender.ERROR.MaxBackupIndex = 5
-
-log4j.appender.ERROR.layout=org.apache.log4j.PatternLayout
-log4j.appender.ERROR.layout.ConversionPattern=[%c:%p %X %L] %m%n
-
-# spring
-log4j.logger.org.springframework=INFO
-log4j.logger.org.springframework.aop.framework=INFO
-log4j.logger.org.springframework.transaction=INFO
-log4j.logger.org.springframework.transaction.support=INFO
-log4j.logger.org.springframework.security.extensions=INFO
-#mybatis
-log4j.logger.org.mybatis=INFO
-log4j.logger.org.apache.ibatis=INFO
-#java.sql
-log4j.logger.java.sql=DEBUG
-log4j.logger.java.sql.Connection=DEBUG
-log4j.logger.java.sql.Statement=DEBUG
-log4j.logger.java.sql.PreparedStatement=DEBUG
-log4j.logger.java.sql.ResultSet=DEBUG
-#com.connsec
-log4j.logger.com.connsec.i18n=INFO
-log4j.logger.com.connsec.web.Application=INFO
-log4j.logger.com.connsec.web.interceptor=DEBUG
-log4j.logger.com.connsec.web.tag=INFO
-log4j.logger.com.connsec=DEBUG
-log4j.logger.com.connsec.db=DEBUG
-log4j.logger.com.connsec.db.persistence=TRACE
-log4j.logger.com.connsec.dao.persistence=TRACE
-log4j.logger.com.connsec.dao.service=DEBUG
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties
new file mode 100644
index 000000000..55f2979ed
--- /dev/null
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties
@@ -0,0 +1,56 @@
+global.access.application=MaxKey\u5E94\u7528\u5B89\u5168\u7CFB\u7EDF
+global.change.language=\u8BED\u97F3\u9009\u62E9
+global.change.language.en=\u82F1\u6587
+global.change.language.zh=\u4E2D\u6587
+global.text.welcome=\u6B22\u8FCE\u60A8
+global.text.manage=\u7BA1\u7406
+global.text.copyright=\u7248\u6743\u6240\u6709
+global.text.copyright.content=shimingxy@163.com
+global.text.logout=\u9000\u51FA
+global.logout.tip=\u6CE8\u9500\u6210\u529F
+global.logout.text.suffix=\u91CD\u65B0\u767B\u5F55
+global.logout.text.prefix=\u60A8\u5DF2\u7ECF\u6210\u529F\u9000\u51FA\u767B\u5F55\uFF0C\u8BF7\u5173\u95ED\u6D4F\u89C8\u5668\u6216\u8005
+global.session.timeout.tip=\u767B\u5F55\u4F1A\u8BDD\u8D85\u65F6
+global.session.timeout.prefix=\u60A8\u7684\u767B\u5F55\u4F1A\u8BDD\u5DF2\u7ECF\u8D85\u65F6\uFF0C\u8BF7
+global.session.timeout.suffix=\u91CD\u65B0\u767B\u5F55
+
+common.window.title=\u7A97\u53E3
+common.alert.title=\u63D0\u793A\u4FE1\u606F
+common.alert.closeText=\u5173\u95ED
+common.conform.title=\u786E\u8BA4\u63D0\u793A
+common.conform.yes=\u786E\u5B9A
+common.conform.no=\u5173\u95ED
+common.select.hintText=\u8BF7\u9009\u62E9\u60A8\u8981\u64CD\u4F5C\u7684\u6570\u636E
+common.delete.hintText=\u60A8\u786E\u5B9A\u8981\u5220\u9664\u5417?
+common.grid.loadtext=\u6B63\u5728\u52A0\u8F7D...
+common.grid.loadnodata=\u6CA1\u6709\u67E5\u8BE2\u5230\u7B26\u5408\u6570\u636E
+common.submit.hintText=\u60A8\u786E\u5B9A\u8981\u8FDB\u884C\u6B64\u9879\u64CD\u4F5C\u5417?
+common.submit.errorText=\u6267\u884C\u64CD\u4F5C\u5931\u8D25
+
+
+login.text.login.twofactor.obtain.valid=\u91CD\u65B0\u83B7\u53D6
+login.text.login.twofactor.obtain=\u83B7\u53D6\u52A8\u6001\u9A8C\u8BC1\u7801
+login.text.login.twofactor.obtain.valid.unit=\u79D2
+login.text.login.twofactor.validTime=\u5269\u4F59\u65F6\u95F4
+login.text.login.twofactor.validTime.unit=\u79D2
+login.text.login.twofactor=\u5B89\u5168\u8BA4\u8BC1
+login.text.login.normal=\u57FA\u672C\u8BA4\u8BC1
+login.text.username=\u7528\u6237\u540D
+login.text.password=\u5BC6 \u7801
+login.text.captcha=\u9A8C\u8BC1\u7801
+login.text.remeberme=\u8BB0\u4F4F\u767B\u5F55
+login.text.forgotpassword=\u5FD8\u8BB0\u5BC6\u7801
+login.button.login=\u767B\u5F55
+login.text.currenttime=\u65F6 \u95F4
+login.text.otherlogins=\u5176\u4ED6\u767B\u5F55\u65B9\u5F0F
+login.text.register=\u7528\u6237\u6CE8\u518C
+
+
+
+apps.icon=\u56FE\u6807
+apps.name=\u5E94\u7528\u540D\u79F0
+apps.protocol=\u8BBF\u95EE\u534F\u8BAE
+apps.category=\u7C7B\u578B
+button.text.action=\u8BBF\u95EE
+button.text.visit=\u8BBF\u95EE
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol-cas.xml b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol-cas.xml
index 9c515426d..b72cea7d7 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol-cas.xml
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol-cas.xml
@@ -2,7 +2,6 @@
+ http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+
+
+
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-security.xml b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-security.xml
index 327b0be4a..5aa70f3f8 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-security.xml
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-security.xml
@@ -2,7 +2,6 @@
+ http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-
-
-
-
-
- org.maxkey.domain.xml.UserInfoXML
-
-
-
-
-
-
-
-
- application/xml;charset=UTF-8
-
-
-
-
-
-
-
-
- application/json;charset=UTF-8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -212,20 +110,90 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 70
+ 25
+ no
+ com.google.code.kaptcha.impl.ShadowGimpy
+ 23
+ 0123456789
+ 4
+ com.google.code.kaptcha.impl.NoNoise
+
+
+
+
+
+
-
-
-
-
-
+
+
+
@@ -247,13 +215,13 @@
+
-
+
-
+
-
+
-
+
+ http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-social.xml b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-social.xml
index de960352b..a02ac97c6 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-social.xml
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-social.xml
@@ -18,6 +18,9 @@
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey.xml b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey.xml
index 7b492c6c5..65645b18e 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey.xml
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey.xml
@@ -30,27 +30,7 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 70
- 25
- no
- com.google.code.kaptcha.impl.ShadowGimpy
- 23
- 0123456789
- 4
- com.google.code.kaptcha.impl.NoNoise
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ classpath:messages/message
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.maxkey.domain.xml.UserInfoXML
+
+
+
+
+
+
+
+
+ application/xml;charset=UTF-8
+
+
+
+
+
+
+
+
+ application/json;charset=UTF-8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/tags/connsecTag.tld b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/tags/connsecTag.tld
index 691c09e14..cf7196c8b 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/tags/connsecTag.tld
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/tags/connsecTag.tld
@@ -8,27 +8,27 @@
www.connsec.com
Base
- com.connsec.web.tag.BaseTag
+ org.maxkey.web.tag.BaseTag
empty
BasePath
- com.connsec.web.tag.BasePathTag
+ org.maxkey.web.tag.BasePathTag
empty
GenId
- com.connsec.web.tag.GenIdTag
+ org.maxkey.web.tag.GenIdTag
empty
Message
- com.connsec.web.tag.MessageTag
+ org.maxkey.web.tag.MessageTag
empty
Date
- com.connsec.web.tag.DateTag
+ org.maxkey.web.tag.DateTag
empty
name
@@ -41,7 +41,7 @@
Browser
- com.connsec.web.tag.BrowserTag
+ org.maxkey.web.tag.BrowserTag
JSP
version
@@ -52,21 +52,94 @@
Username
- com.connsec.web.tag.UsernameTag
+ org.maxkey.web.tag.UsernameTag
empty
+
+ Retrieves the message with the given code, or text if code isn't resolvable.
+ The HTML escaping flag participates in a page-wide or application-wide setting
+ (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
Locale
- com.connsec.web.tag.LocaleTag
- empty
+ org.maxkey.web.tag.LocaleTag
+ JSP
+ A MessageSourceResolvable argument (direct or through JSP EL).
+ Fits nicely when used in conjunction with Spring's own validation error classes
+ which all implement the MessageSourceResolvable interface. For example, this
+ allows you to iterate over all of the errors in a form, passing each error
+ (using a runtime expression) as the value of this 'message' attribute, thus
+ effecting the easy display of such error messages.
+ message
+ false
+ true
+
+
+ The code (key) to use when looking up the message.
+ If code is not provided, the text attribute will be used.
code
+ false
+ true
+
+
+ Set optional message arguments for this tag, as a (comma-)
+ delimited String (each String argument can contain JSP EL), an Object array
+ (used as argument array), or a single Object (used as single argument).
+ You can additionally use nested spring:argument tags.
+ arguments
+ false
+ true
+
+
+ The separator character to be used for splitting the
+ arguments string value; defaults to a 'comma' (',').
+ argumentSeparator
+ false
+ true
+
+
+ Default text to output when a message for the given code
+ could not be found. If both text and code are not set, the tag will
+ output null.
+ text
+ false
+ true
+
+
+ The string to use when binding the result to the page,
+ request, session or application scope. If not specified, the result
+ gets outputted to the writer (i.e. typically directly to the JSP).
+ var
+ false
+ true
+
+
+ The scope to use when exporting the result to a variable.
+ This attribute is only used when var is also set. Possible values are
+ page, request, session and application.
+ scope
+ false
+ true
+
+
+ Set HTML escaping for this tag, as boolean value.
+ Overrides the default HTML escaping setting for the current page.
+ htmlEscape
+ false
+ true
+
+
+ Set JavaScript escaping for this tag, as boolean value.
+ Default is 'false'.
+ javaScriptEscape
+ false
true
+
PathVariable
- com.connsec.web.tag.PathVariableTag
+ org.maxkey.web.tag.PathVariableTag
JSP
index
@@ -75,7 +148,7 @@
Parameter
- com.connsec.web.tag.ParameterTag
+ org.maxkey.web.tag.ParameterTag
JSP
name
@@ -86,7 +159,7 @@
Grid
- com.connsec.web.tag.GridTag
+ org.maxkey.web.tag.GridTag
JSP
url
@@ -127,7 +200,7 @@
Column
- com.connsec.web.tag.ColumnTag
+ org.maxkey.web.tag.ColumnTag
JSP
field
@@ -163,7 +236,7 @@
Dialog
- com.connsec.web.tag.DialogTag
+ org.maxkey.web.tag.DialogTag
empty
url
@@ -195,7 +268,7 @@
Tree
- com.connsec.web.tag.TreeTag
+ org.maxkey.web.tag.TreeTag
empty
id
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/footer.jsp b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/footer.jsp
index 2d7dcece4..c5ae54a71 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/footer.jsp
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/footer.jsp
@@ -8,7 +8,7 @@
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/top.jsp b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/top.jsp
index 284aaa6bf..38be5dcab 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/top.jsp
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/top.jsp
@@ -14,7 +14,7 @@
-
+ <%System.out.println(WebContext.getUserInfo()); %>
<%if(WebContext.getUserInfo().getGridList()==0) {%>
@@ -32,24 +32,20 @@
+
-
+
-
-
-
-
-
+
\ No newline at end of file
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/loggedout.jsp b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/loggedout.jsp
index d79f0e27d..7c91b5ca3 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/loggedout.jsp
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/loggedout.jsp
@@ -7,7 +7,9 @@
- <s:Locale code="global.logout.tip"/>