a

maxkey-webs/maxkey-web-manage/src/main/java/org/maxkey/tasks/oauth/OauthTokenCodeCleaner.java

@@ -1,47 +0,0 @@
-package org.maxkey.tasks.oauth;
-
-import java.util.Date;
-
-
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-public class OauthTokenCodeCleaner {
-	
-	final static Logger _logger = LoggerFactory.getLogger(OauthTokenCodeCleaner.class);
-	
-	JdbcTemplate jdbcTemplate;
-
-	public static final String OAUTH_CODE_CLEANER_SQL="DELETE FROM OAUTH_CODE WHERE ALLOCATEDTIME < ?";
-	
-	public static final String OAUTH10A_REQUEST_TOKEN_CLEANER_SQL="DELETE FROM OAUTH10A_REQUEST_TOKEN WHERE ALLOCATEDTIME < ?";
-	
-	public static final String OAUTH10A_VERIFIER_CLEANER_SQL="DELETE FROM OAUTH10A_VERIFIER WHERE ALLOCATEDTIME < ?";
-	
-	public void clean() {
-		_logger.info("OAuth Token & Code Cleaner start . ");
-		DateTime currentdateTime = new DateTime();
-		_logger.info("current date time : " +currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss")));
-		currentdateTime=currentdateTime.minusMinutes(10);
-		Date date=currentdateTime.toDate();
-		_logger.info("OAuth Code Cleaner date time : " +currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss")));
-		jdbcTemplate.update(OAUTH_CODE_CLEANER_SQL, date);
-		jdbcTemplate.update(OAUTH10A_REQUEST_TOKEN_CLEANER_SQL, date);
-		jdbcTemplate.update(OAUTH10A_VERIFIER_CLEANER_SQL, date);
-		_logger.info("OAuth Token & Code Cleaner Successful");
-	}
-	 
-	 
-	public JdbcTemplate getJdbcTemplate() {
-		return jdbcTemplate;
-	}
-
-	public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
-		this.jdbcTemplate = jdbcTemplate;
-	}
-	
-	
-}

maxkey-webs/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BaseSAMLAppContorller.java

@@ -1,95 +0,0 @@
-/**
- * 
- */
-package org.maxkey.web.apps.contorller;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.cert.X509Certificate;
-
-import org.maxkey.authz.saml20.metadata.MetadataDescriptorUtil;
-import org.maxkey.crypto.cert.NameUtil;
-import org.maxkey.crypto.cert.X509CertUtils;
-import org.maxkey.crypto.keystore.KeyStoreLoader;
-import org.maxkey.crypto.keystore.KeyStoreUtil;
-import org.maxkey.domain.apps.SAMLBaseDetails;
-import org.opensaml.common.xml.SAMLConstants;
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.saml2.metadata.SPSSODescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-
-/**
- * @author Crystal.Sea
- *
- */
-public class BaseSAMLAppContorller extends BaseAppContorller {
-
-	final static Logger _logger = LoggerFactory.getLogger(BaseSAMLAppContorller.class);
-	
-	@Autowired
-	@Qualifier("keyStoreLoader")
-	private KeyStoreLoader idpKeyStoreLoader;
-
-	protected SAMLBaseDetails transform(SAMLBaseDetails samlDetails) throws Exception{
-	
-		super.transform(samlDetails);
-		
-		X509Certificate trustCert = null;
-		if (null!=samlDetails.getCertMetaFile()&&!samlDetails.getCertMetaFile().isEmpty()) {
-			if(null==samlDetails.getFileType()||samlDetails.getFileType().equals("certificate")){//certificate file
-				try {
-					InputStream isCert = samlDetails.getCertMetaFile().getInputStream();
-					trustCert = X509CertUtils.loadCertFromInputStream(isCert);
-					isCert.close();
-				} catch (IOException e) {
-					_logger.error("read certificate file error .", e);
-					throw new Exception("read certificate file error", e);
-				}
-			}else if(samlDetails.getFileType().equals("metadata")){//metadata file
-				EntityDescriptor entityDescriptor;
-				try {
-					entityDescriptor = MetadataDescriptorUtil.getInstance().getEntityDescriptor(samlDetails.getCertMetaFile().getInputStream());
-				} catch (IOException e) {
-					_logger.error("metadata  file resolve error .", e);
-					throw new Exception("metadata  file resolve error", e);
-				}
-				SPSSODescriptor sPSSODescriptor = entityDescriptor.getSPSSODescriptor(SAMLConstants.SAML20P_NS);
-				String b64Encoder = sPSSODescriptor.getKeyDescriptors().get(0).getKeyInfo().getX509Datas().get(0).getX509Certificates().get(0).getValue();
-
-				trustCert = X509CertUtils.loadCertFromB64Encoded(b64Encoder);
-
-				samlDetails.setSpAcsUrl(sPSSODescriptor.getAssertionConsumerServices().get(0).getLocation());
-				samlDetails.setEntityId(entityDescriptor.getEntityID());
-
-				_logger.info("SPSSODescriptor EntityID"+ entityDescriptor.getEntityID());
-			}
-
-			samlDetails.setCertSubject(trustCert.getSubjectDN().getName());
-			samlDetails.setCertExpiration(trustCert.getNotAfter().toString());
-
-			samlDetails.setCertIssuer(NameUtil.getCommonName(trustCert.getIssuerX500Principal()));
-			
-			KeyStore keyStore = KeyStoreUtil.clone(idpKeyStoreLoader.getKeyStore(),idpKeyStoreLoader.getKeystorePassword());
-
-			KeyStore trustKeyStore = null;
-			if (!samlDetails.getEntityId().equals("")) {
-				trustKeyStore = KeyStoreUtil.importTrustCertificate(keyStore,trustCert, samlDetails.getEntityId());
-			} else {
-				trustKeyStore = KeyStoreUtil.importTrustCertificate(keyStore,trustCert);
-			}
-
-			byte[] keyStoreByte = KeyStoreUtil.keyStore2Bytes(trustKeyStore,idpKeyStoreLoader.getKeystorePassword());
-
-			// store KeyStore content
-			samlDetails.setKeyStore(keyStoreByte);
-		} 
-		
-		return samlDetails;
-	}
-	
-
-}

maxkey-webs/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java

@@ -1,18 +1,31 @@
 package org.maxkey.web.apps.contorller;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.security.cert.X509Certificate;
 import java.util.List;
 
+import org.maxkey.authz.saml20.metadata.MetadataDescriptorUtil;
 import org.maxkey.constants.OPERATEMESSAGE;
 import org.maxkey.constants.PROTOCOLS;
 import org.maxkey.crypto.ReciprocalUtils;
+import org.maxkey.crypto.cert.NameUtil;
+import org.maxkey.crypto.cert.X509CertUtils;
+import org.maxkey.crypto.keystore.KeyStoreLoader;
+import org.maxkey.crypto.keystore.KeyStoreUtil;
 import org.maxkey.dao.service.Saml20DetailsService;
 import org.maxkey.domain.apps.SAML20Details;
 import org.maxkey.web.WebContext;
 import org.maxkey.web.message.Message;
 import org.maxkey.web.message.MessageType;
+import org.opensaml.common.xml.SAMLConstants;
+import org.opensaml.saml2.metadata.EntityDescriptor;
+import org.opensaml.saml2.metadata.SPSSODescriptor;
 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.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -23,10 +36,14 @@ import org.springframework.web.servlet.ModelAndView;
 
 @Controller
 @RequestMapping(value={"/apps/saml20"})
-public class SAML20DetailsController  extends BaseSAMLAppContorller {
+public class SAML20DetailsController   extends BaseAppContorller {
 	final static Logger _logger = LoggerFactory.getLogger(SAML20DetailsController.class);
 	
 	@Autowired
+	@Qualifier("keyStoreLoader")
+	private KeyStoreLoader idpKeyStoreLoader;
+	
+	@Autowired
 	Saml20DetailsService saml20DetailsService;
 	
 	@RequestMapping(value = { "/forwardAdd" })
@@ -107,7 +124,62 @@ public class SAML20DetailsController  extends BaseSAMLAppContorller {
 		}
 	}
 	
+	protected SAML20Details transform(SAML20Details samlDetails) throws Exception{
+		
+		super.transform(samlDetails);
+		
+		X509Certificate trustCert = null;
+		if (null!=samlDetails.getCertMetaFile()&&!samlDetails.getCertMetaFile().isEmpty()) {
+			if(null==samlDetails.getFileType()||samlDetails.getFileType().equals("certificate")){//certificate file
+				try {
+					InputStream isCert = samlDetails.getCertMetaFile().getInputStream();
+					trustCert = X509CertUtils.loadCertFromInputStream(isCert);
+					isCert.close();
+				} catch (IOException e) {
+					_logger.error("read certificate file error .", e);
+					throw new Exception("read certificate file error", e);
+				}
+			}else if(samlDetails.getFileType().equals("metadata")){//metadata file
+				EntityDescriptor entityDescriptor;
+				try {
+					entityDescriptor = MetadataDescriptorUtil.getInstance().getEntityDescriptor(samlDetails.getCertMetaFile().getInputStream());
+				} catch (IOException e) {
+					_logger.error("metadata  file resolve error .", e);
+					throw new Exception("metadata  file resolve error", e);
+				}
+				SPSSODescriptor sPSSODescriptor = entityDescriptor.getSPSSODescriptor(SAMLConstants.SAML20P_NS);
+				String b64Encoder = sPSSODescriptor.getKeyDescriptors().get(0).getKeyInfo().getX509Datas().get(0).getX509Certificates().get(0).getValue();
+
+				trustCert = X509CertUtils.loadCertFromB64Encoded(b64Encoder);
+
+				samlDetails.setSpAcsUrl(sPSSODescriptor.getAssertionConsumerServices().get(0).getLocation());
+				samlDetails.setEntityId(entityDescriptor.getEntityID());
+
+				_logger.info("SPSSODescriptor EntityID"+ entityDescriptor.getEntityID());
+			}
+
+			samlDetails.setCertSubject(trustCert.getSubjectDN().getName());
+			samlDetails.setCertExpiration(trustCert.getNotAfter().toString());
 
+			samlDetails.setCertIssuer(NameUtil.getCommonName(trustCert.getIssuerX500Principal()));
+			
+			KeyStore keyStore = KeyStoreUtil.clone(idpKeyStoreLoader.getKeyStore(),idpKeyStoreLoader.getKeystorePassword());
+
+			KeyStore trustKeyStore = null;
+			if (!samlDetails.getEntityId().equals("")) {
+				trustKeyStore = KeyStoreUtil.importTrustCertificate(keyStore,trustCert, samlDetails.getEntityId());
+			} else {
+				trustKeyStore = KeyStoreUtil.importTrustCertificate(keyStore,trustCert);
+			}
+
+			byte[] keyStoreByte = KeyStoreUtil.keyStore2Bytes(trustKeyStore,idpKeyStoreLoader.getKeystorePassword());
+
+			// store KeyStore content
+			samlDetails.setKeyStore(keyStoreByte);
+		} 
+		
+		return samlDetails;
+	}
 	
 	
 }

maxkey-webs/maxkey-web-maxkey/bin/main/messages/message.properties

@@ -49,7 +49,6 @@ login.password.expired=\u5BC6\u7801\u8FC7\u671F
 login.password.expired.tip=\u5BC6\u7801\u8FC7\u671F\uFF0C\u8BF7\u4FEE\u6539\u5BC6\u7801
 login.password.newPassword=\u65B0\u5BC6\u7801
 login.password.confirmPassword=\u786E\u8BA4\u65B0\u5BC6\u7801
-
 login.password.initial.change.tip=\u9996\u6B21\u767B\u5F55\uFF0C\u8BF7\u4FEE\u6539\u521D\u59CB\u5316\u5BC6\u7801
 
 userinfo.displayName=\u7528\u6237

maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties

@@ -49,7 +49,6 @@ login.password.expired=\u5BC6\u7801\u8FC7\u671F
 login.password.expired.tip=\u5BC6\u7801\u8FC7\u671F\uFF0C\u8BF7\u4FEE\u6539\u5BC6\u7801
 login.password.newPassword=\u65B0\u5BC6\u7801
 login.password.confirmPassword=\u786E\u8BA4\u65B0\u5BC6\u7801
-
 login.password.initial.change.tip=\u9996\u6B21\u767B\u5F55\uFF0C\u8BF7\u4FEE\u6539\u521D\u59CB\u5316\u5BC6\u7801
 
 userinfo.displayName=\u7528\u6237

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/tiles/tiles-authz.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE tiles-definitions PUBLIC 
-		"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" 
-		"http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-		
-<tiles-definitions>
-	<!-- layout define  -->
-	<definition name="authorize.definition" template="/WEB-INF/views/layout/layoutauthn.jsp">
-		<put-attribute name="header" value="/WEB-INF/views/layout/header.jsp" />
-		<put-attribute name="js" value="/WEB-INF/views/layout/common.js.jsp" />
-		<put-attribute name="css" value="/WEB-INF/views/layout/common.css.jsp" />
-		<put-attribute name="top" value="/WEB-INF/views/layout/top.jsp" />
-		<put-attribute name="content" value="" />
-		<put-attribute name="footer" value="/WEB-INF/views/layout/footer.jsp" />
-	</definition>
-	
-
-	<!-- page define -->
-	<definition name="authorize/desktop_sso_execute" extends="authorize.definition">
-		<put-attribute name="content" value="/WEB-INF/views/authorize/desktop_sso_execute.jsp" />
-	</definition>
-	
-	<definition name="authorize/formbased_sso_submint" extends="authorize.definition">
-		<put-attribute name="content" value="/WEB-INF/views/authorize/formbased_sso_submint.jsp" />
-	</definition>
-	
-	<definition name="authorize/tokenbased_sso_submint" extends="authorize.definition">
-		<put-attribute name="content" value="/WEB-INF/views/authorize/tokenbased_sso_submint.jsp" />
-	</definition>
-	
-	<definition name="authorize/oauth_access_confirmation" extends="authorize.definition">
-		<put-attribute name="content" value="/WEB-INF/views/authorize/oauth_access_confirmation.jsp" />
-	</definition>
-	
-	<definition name="authorize/init_sso_credential" extends="authorize.definition">
-		<put-attribute name="content" value="/WEB-INF/views/authorize/init_sso_credential.jsp" />
-	</definition>
-	
-	<definition name="authorize/protected/forward" extends="authorize.definition">
-		<put-attribute name="content" value="/WEB-INF/views/authorize/app_password_protected.jsp" />
-	</definition>
-	
-	
-</tiles-definitions>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/tiles/tiles-main.xml

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE tiles-definitions PUBLIC 
-		"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" 
-		"http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-		
-<tiles-definitions>
-	<!-- page define -->
-	
-	<!-- my Applications -->
-	<definition name="main/appList" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/main/appList.jsp" />
-	</definition>
-	<definition name="main/appConfigList" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/main/appConfigList.jsp" />
-	</definition>
-	<definition name="main/appProtectedConfig" extends="window.definition">
-		<put-attribute name="content" value="/WEB-INF/views/main/appProtectedConfig.jsp" />
-	</definition>
-	<definition name="main/appUserConfig" extends="window.definition">
-		<put-attribute name="content" value="/WEB-INF/views/main/appUserConfig.jsp" />
-	</definition>
-	
-	<!-- security  setting-->
-	<definition name="safe/setting" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/safe/setting.jsp" />
-	</definition>
-	<definition name="safe/changePassword" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/safe/changePassword.jsp" />
-	</definition>
-	<definition name="safe/changeAppLoginPasswod" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/safe/changeAppLoginPasswod.jsp" />
-	</definition>
-	<definition name="safe/question" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/safe/question.jsp" />
-	</definition>
-	<definition name="safe/mobile" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/safe/mobile.jsp" />
-	</definition>
-	<definition name="safe/email" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/safe/email.jsp" />
-	</definition>
-	
-	<!-- my profile -->	
-	<definition name="profile/basic" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/profile/basic.jsp" />
-	</definition>
-	<definition name="profile/home" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/profile/home.jsp" />
-	</definition>
-	<definition name="profile/company" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/profile/company.jsp" />
-	</definition>
-	<definition name="profile/extra" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/profile/extra.jsp" />
-	</definition>
-	
-	<!-- Social Sign On Provider  -->
-	<definition name="social/socialSignOnProvider" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/social/socialSignOnProvider.jsp" />
-	</definition>
-
-	<!-- one time password -->
-	<definition name="otp/timeBased" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/otp/timeBased.jsp" />
-	</definition>
-	<definition name="otp/counterBased" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/otp/counterBased.jsp" />
-	</definition>
-	<definition name="otp/hotp" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/otp/hotp.jsp" />
-	</definition>
-	
-	<!-- contact -->
-	<definition name="contact/contactList" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/contact/contactList.jsp" />
-	</definition>
-	<definition name="contact/nameCard" extends="window.definition">
-		<put-attribute name="content" value="/WEB-INF/views/contact/nameCard.jsp" />
-	</definition>
-	<definition name="contact/details" extends="window.definition">
-		<put-attribute name="content" value="/WEB-INF/views/contact/details.jsp" />
-	</definition>
-	
-</tiles-definitions>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/tiles/tiles-system.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE tiles-definitions PUBLIC 
-		"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" 
-		"http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-		
-<tiles-definitions>
-	<!-- common action define -->
-	<definition name="index" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/layout/main.jsp" />
-	</definition>
-	
-	<definition name="login" extends="frame.definition">
-		<put-attribute name="content" value="/WEB-INF/views/login.jsp" />
-	</definition>
-	
-	<definition name="loggedout" extends="frame.definition">
-		<put-attribute name="content" value="/WEB-INF/views/loggedout.jsp" />
-	</definition>
-	
-	<definition name="timeout" extends="frame.definition">
-		<put-attribute name="content" value="/WEB-INF/views/timeout.jsp" />
-	</definition>
-	
-	<!-- forgot password -->
-	<definition name="forgotpassword/forward" extends="frame.definition">
-		<put-attribute name="content" value="/WEB-INF/views/forgotpwd/findpwd.jsp" />
-	</definition>
-	<definition name="forgotpassword/email" extends="frame.definition">
-		<put-attribute name="content" value="/WEB-INF/views/forgotpwd/email.jsp" />
-	</definition>
-	<definition name="forgotpassword/resetpwd" extends="frame.definition">
-		<put-attribute name="content" value="/WEB-INF/views/forgotpwd/resetpwd.jsp" />
-	</definition>
-	<definition name="forgotpassword/pwdreseted" extends="frame.definition">
-		<put-attribute name="content" value="/WEB-INF/views/forgotpwd/pwdreseted.jsp" />
-	</definition>
-	
-	<!-- Change Initial Password -->
-	<definition name="passwordInitial" extends="frame.definition">
-		<put-attribute name="content" value="/WEB-INF/views/passwordInitial.jsp" />
-	</definition>
-	<!-- Password Expired -->
-	<definition name="passwordExpired" extends="frame.definition">
-		<put-attribute name="content" value="/WEB-INF/views/passwordExpired.jsp" />
-	</definition>
-	
-	<!-- logs -->
-	<definition name="logs/logsList" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/logs/logsList.jsp" />
-	</definition>
-	<definition name="logs/loginHistoryList" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/logs/loginHistoryList.jsp" />
-	</definition>
-	<definition name="logs/loginAppHistoryList" extends="base.definition">
-		<put-attribute name="content" value="/WEB-INF/views/logs/loginAppHistoryList.jsp" />
-	</definition>
-	
-	<!-- for select -->
-	<definition name="orgs/orgsSelect" extends="window.definition">
-		<put-attribute name="content" value="/WEB-INF/views/orgs/orgsSelect.jsp" />
-	</definition>
-	
-	<definition name="users/usersSelect" extends="window.definition">
-		<put-attribute name="content" value="/WEB-INF/views/users/usersSelect.jsp" />
-	</definition>	
-</tiles-definitions>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/tiles/tiles.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE tiles-definitions PUBLIC 
-		"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" 
-		"http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-		
-<tiles-definitions>
-	<!-- layout define  -->
-	<definition name="base.definition" template="/WEB-INF/views/layout/layout.jsp">
-		<put-attribute name="header" value="/WEB-INF/views/layout/header.jsp" />
-		<put-attribute name="js" value="/WEB-INF/views/layout/common.js.jsp" />
-		<put-attribute name="css" value="/WEB-INF/views/layout/common.css.jsp" />
-		<put-attribute name="top" value="/WEB-INF/views/layout/top.jsp" />
-		<put-attribute name="nav_primary" value="/WEB-INF/views/layout/nav_primary.jsp" />
-		<put-attribute name="nav_second" value="/WEB-INF/views/layout/nav_second.jsp" />
-		<put-attribute name="nav_third" value="/WEB-INF/views/layout/nav_third.jsp" />
-		<put-attribute name="content" value="" />
-		<put-attribute name="footer" value="/WEB-INF/views/layout/footer.jsp" />
-	</definition>
-	
-	<definition name="frame.definition" template="/WEB-INF/views/layout/frame.jsp">
-		<put-attribute name="header" value="/WEB-INF/views/layout/header.jsp" />
-		<put-attribute name="js" value="/WEB-INF/views/layout/common.js.jsp" />
-		<put-attribute name="css" value="/WEB-INF/views/layout/common.css.jsp" />
-		<put-attribute name="top" value="/WEB-INF/views/layout/nologintop.jsp" />
-		<put-attribute name="content" value="" />
-		<put-attribute name="footer" value="/WEB-INF/views/layout/footer.jsp" />
-	</definition>
-	
-	<definition name="window.definition" template="/WEB-INF/views/layout/window.jsp">
-		<put-attribute name="header" value="/WEB-INF/views/layout/header.jsp" />
-		<put-attribute name="js" value="/WEB-INF/views/layout/common.js.jsp" />
-		<put-attribute name="css" value="/WEB-INF/views/layout/common.css.jsp" />
-		<put-attribute name="content" value="" />
-	</definition>
-	
-</tiles-definitions>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/app_password_protected.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/desktop_qq_sso_execute.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html>
 	<head>
 	  	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/desktop_sso_execute.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/formbased_netease_163email_sso_submint.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/formbased_netease_noteyoudao_sso_submint.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/formbased_qq_exmail_sso_submint.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
-<%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib 	prefix="c" 	uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/formbased_redirect_post_submint.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/formbased_redirect_submint.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/formbased_sso_submint.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/init_sso_credential.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/oauth_access_confirmation.jsp

@@ -4,7 +4,7 @@
 <%@ page 	import="org.maxkey.authz.oauth2.common.exceptions.UnapprovedClientAuthenticationException" %>
 <%@ page    import="org.springframework.security.web.WebAttributes" %>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <jsp:include page="../layout/header.jsp"></jsp:include>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/tokenbased_jwt_sso_submint.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/tokenbased_sso_submint.jsp

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
 <%@ taglib 	prefix="c" 		uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/forgotpwd/email.jsp

@@ -2,7 +2,7 @@
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="spring"  	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 			uri="http://www.connsec.com/tags" %> 
+<%@ taglib prefix="s" 			uri="http://sso.maxkey.org/tags" %> 
 
 <div class="container">	
   <c:if test="${0 == emailsend}">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/forgotpwd/findpwd.jsp

@@ -2,7 +2,7 @@
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="spring"  	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 			uri="http://www.connsec.com/tags" %> 
+<%@ taglib prefix="s" 			uri="http://sso.maxkey.org/tags" %> 
 
 <div class="container">	
 	<table border="0"  style="width:100%;">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/forgotpwd/pwdreseted.jsp

@@ -2,7 +2,7 @@
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="spring"  	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 			uri="http://www.connsec.com/tags" %> 
+<%@ taglib prefix="s" 			uri="http://sso.maxkey.org/tags" %> 
 
 <div class="container">	
   <c:if test="${0 == pwdreseted}">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/forgotpwd/resetpwd.jsp

@@ -2,7 +2,7 @@
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="spring"  	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 			uri="http://www.connsec.com/tags" %> 
+<%@ taglib prefix="s" 			uri="http://sso.maxkey.org/tags" %> 
 
 <div class="container">	
   <c:if test="${null != model}">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/common.css.jsp

@@ -1,5 +1,5 @@
 <%@ page   language="java"     import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="s"  uri="http://sso.maxkey.org/tags" %>
 	<%-- common css begin --%>
 	<%-- if browser is not msie 6.0,follow styles over ie 6.0 style --%>
 	<link type="text/css" rel="stylesheet"  href="<s:Base/>/css/base.css"/>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/common.js.jsp

@@ -1,5 +1,5 @@
 <%@ page    language="java"     import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ taglib  prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"  uri="http://sso.maxkey.org/tags" %>
 	<%-- javascript js begin  --%>
 	<%-- jquery base --%>
 	<script type="text/javascript" src="<s:Base/>/jquery/jquery-1.11.2.min.js"></script>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/footer.jsp

@@ -1,5 +1,5 @@
 <%@ page   language="java" import="java.util.*" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" 	uri="http://www.connsec.com/tags" %> 
+<%@ taglib prefix="s" 	uri="http://sso.maxkey.org/tags" %> 
 
      <%-- footer --%>
  	<div class="footer" >

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/header.jsp

@@ -1,5 +1,5 @@
 <%@ page   language="java"     import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="s"  uri="http://sso.maxkey.org/tags" %>
     <title><s:Locale code="global.access.application"/></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta http-equiv="pragma" content="no-cache">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nav_primary.jsp

@@ -2,7 +2,7 @@
 <%@ page   language="java"     import="org.maxkey.web.*" %>
 <%@ page   language="java"     import="org.maxkey.domain.*"%>
 <%@ page   language="java"     import="org.maxkey.domain.userinfo.*"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="s"  uri="http://sso.maxkey.org/tags" %>
 <div id="nav_primay_content" class="menuprimary">
 <div class="menucontainer">
 	<ul >

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nologintop.jsp

@@ -1,8 +1,8 @@
 <%@ page   contentType="text/html; charset=UTF-8" language="java"  %>
 <%@ page   import="org.maxkey.domain.*"%> 
 <%@ page   import="org.maxkey.web.*"%>
-<%@ taglib prefix="c" 			uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="s"  	uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="c" 	uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="s"  	uri="http://sso.maxkey.org/tags" %>
 
 <div id="topBar"  > 
 	<div class="container">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/top.jsp

@@ -1,8 +1,8 @@
 <%@ page   contentType="text/html; charset=UTF-8" language="java"  %>
 <%@ page   import="org.maxkey.domain.*"%> 
 <%@ page   import="org.maxkey.web.*"%>
-<%@ taglib prefix="c" 			uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="s"  	uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="c" 	uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="s"  	uri="http://sso.maxkey.org/tags" %>
 
 <div id="topBar"  > 
 	<div class="container">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/loggedout.jsp

@@ -1,7 +1,7 @@
 <%@page session="false" %>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="spring"  	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 			uri="http://www.connsec.com/tags" %> 
+<%@ taglib prefix="s" 			uri="http://sso.maxkey.org/tags" %> 
 
 <!DOCTYPE HTML>
 

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/login.jsp

@@ -8,7 +8,7 @@
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="spring"  	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 			uri="http://www.connsec.com/tags" %> 
+<%@ taglib prefix="s" 			uri="http://sso.maxkey.org/tags" %> 
 <%if(WebContext.getUserInfo() != null) {%>
 	<authz:authorize access="hasRole('ROLE_USER')"><script type="text/javascript"> 
 			window.top.location.href="<s:Base />/forwardindex";

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/logs/loginAppHistoryList.jsp

@@ -2,7 +2,7 @@
 <%@ page 	import="org.maxkey.domain.*"%> 
 <%@ page 	import="java.util.Map,java.util.LinkedHashMap"%>
 <%@ page 	import="org.maxkey.web.*"%>
-<%@ taglib  prefix="s"   uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"   		uri="http://sso.maxkey.org/tags" %>
 <%@ taglib  prefix="c"			uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib  prefix="spring"  	uri="http://www.springframework.org/tags" %>
 

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/logs/loginHistoryList.jsp

@@ -2,7 +2,7 @@
 <%@ page 	import="org.maxkey.domain.*"%> 
 <%@ page 	import="java.util.Map,java.util.LinkedHashMap"%>
 <%@ page 	import="org.maxkey.web.*"%>
-<%@ taglib  prefix="s"   uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"   		uri="http://sso.maxkey.org/tags" %>
 <%@ taglib  prefix="c"			uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib  prefix="spring"  	uri="http://www.springframework.org/tags" %>
 

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/logs/logsList.jsp

@@ -2,7 +2,7 @@
 <%@ page 	import="org.maxkey.domain.*"%> 
 <%@ page 	import="java.util.Map,java.util.LinkedHashMap"%>
 <%@ page 	import="org.maxkey.web.*"%>
-<%@ taglib  prefix="s"   uri="http://www.connsec.com/tags" %>
+<%@ taglib  prefix="s"   		uri="http://sso.maxkey.org/tags" %>
 <%@ taglib  prefix="c"			uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="spring"  	uri="http://www.springframework.org/tags" %>
 

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appConfigList.jsp

@@ -1,11 +1,11 @@
 <%@ page   language="java"  import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ page   import="org.maxkey.domain.*"%> 
 <%@ page   import="org.maxkey.web.*"%>
-<%@ taglib prefix="spring"  uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
-<%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib 	prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib 	prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib 	prefix="s" 		uri="http://sso.maxkey.org/tags" %>
+<%@ taglib 	prefix="c"      uri="http://java.sun.com/jsp/jstl/core"  %>
+<%@ taglib 	prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
 <script type="text/javascript">	
 $(function () {
 	$(".configUser").on("click",function(){

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appList.jsp

@@ -3,7 +3,7 @@
 <%@ page   import="org.maxkey.web.*"%>
 <%@ taglib prefix="spring"  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="s" 		uri="http://sso.maxkey.org/tags" %>
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
 

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appProtectedConfig.jsp

@@ -2,7 +2,7 @@
 <%@ page   import="org.maxkey.web.*"%>
 <%@ taglib prefix="c"		uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="spring"	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 	uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="s" 	uri="http://sso.maxkey.org/tags" %>
 
 
 <script type="text/javascript">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appUserConfig.jsp

@@ -2,7 +2,7 @@
 <%@ page   import="org.maxkey.web.*"%>
 <%@ taglib prefix="c"		uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="spring"	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 	uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="s" 		uri="http://sso.maxkey.org/tags" %>
 
 
 <script type="text/javascript">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/counterBased.jsp

@@ -1,8 +1,8 @@
 <%@ page   language="java"  import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ taglib prefix="spring"  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
+<%@ taglib prefix="s" 		uri="http://sso.maxkey.org/tags" %>
+<%@ taglib prefix="c"       uri="http://java.sun.com/jsp/jstl/core"  %>
 
 <table width="100%">
   <tr>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/hotp.jsp

@@ -1,7 +1,7 @@
 <%@ page   language="java"  import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ taglib prefix="spring"  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="s" 		uri="http://sso.maxkey.org/tags" %>
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 
 <table width="100%">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/timeBased.jsp

@@ -1,7 +1,7 @@
 <%@ page   language="java"  import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ taglib prefix="spring"  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="s" 		uri="http://sso.maxkey.org/tags" %>
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 
 <table width="100%">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordExpired.jsp

@@ -1,6 +1,6 @@
 <%@page session="false" %>
 <%@taglib prefix="c" 		uri="http://java.sun.com/jsp/jstl/core" %>
-<%@taglib prefix="s" 		uri="http://www.connsec.com/tags" %> 
+<%@taglib prefix="s" 		uri="http://sso.maxkey.org/tags" %> 
 <!DOCTYPE HTML >
 <html>
 	<head>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordInitial.jsp

@@ -1,6 +1,6 @@
 <%@page session="false" %>
 <%@taglib prefix="c" 		uri="http://java.sun.com/jsp/jstl/core" %>
-<%@taglib prefix="s" 		uri="http://www.connsec.com/tags" %> 
+<%@taglib prefix="s" 		uri="http://sso.maxkey.org/tags" %> 
 <!DOCTYPE HTML >
 <html>
 	<head>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/profile/basic.jsp

@@ -1,9 +1,9 @@
 <%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ page   import="org.maxkey.web.*"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="s"  		uri="http://sso.maxkey.org/tags" %>
+<%@ taglib prefix="spring"	uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fmt"		uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="c"	 	uri="http://java.sun.com/jsp/jstl/core" %>
 
 <script type="text/javascript">
    <!--

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/profile/company.jsp

@@ -1,6 +1,6 @@
 <%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ page   import="org.maxkey.web.*"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="s"  		uri="http://sso.maxkey.org/tags" %>
 <%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/profile/home.jsp

@@ -1,6 +1,6 @@
 <%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ page   import="org.maxkey.web.*"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
+<%@ taglib prefix="s"  		uri="http://sso.maxkey.org/tags" %>
 <%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/activated.jsp

@@ -2,7 +2,7 @@
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="spring"  	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 			uri="http://www.connsec.com/tags" %> 
+<%@ taglib prefix="s" 			uri="http://sso.maxkey.org/tags" %> 
 
 <%
 String path = request.getContextPath();

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/initPassword.jsp

@@ -2,7 +2,7 @@
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="spring"  	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 			uri="http://www.connsec.com/tags" %> 
+<%@ taglib prefix="s" 			uri="http://sso.maxkey.org/tags" %> 
 
 <%
 String path = request.getContextPath();

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/register.jsp

@@ -1,6 +1,6 @@
-<%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
-<%@ taglib 	prefix="fmt"      uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page 	language="java"   	import="java.util.*" 	pageEncoding="UTF-8"%>
+<%@ taglib 	prefix="s" 			uri="http://sso.maxkey.org/tags" %>
+<%@ taglib 	prefix="fmt"      	uri="http://java.sun.com/jsp/jstl/fmt"%>
 
 <%
 String path = request.getContextPath();

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/registered.jsp

@@ -2,7 +2,7 @@
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="spring"  	uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="s" 			uri="http://www.connsec.com/tags" %> 
+<%@ taglib prefix="s" 			uri="http://sso.maxkey.org/tags" %> 
 
 <%
 String path = request.getContextPath();

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/changeAppLoginPasswod.jsp

@@ -1,7 +1,7 @@
 <%@ page   language="java"  import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ taglib prefix="spring"  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
+<%@ taglib 	prefix="s" 		uri="hhttp://sso.maxkey.org/tags" %>
 
 <table width="100%">
   <tr>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/changePassword.jsp

@@ -1,7 +1,7 @@
 <%@ page   language="java"  import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ taglib prefix="spring"  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
+<%@ taglib 	prefix="s" 		uri="http://sso.maxkey.org/tags" %>
 
 <table width="100%">
   <tr>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/email.jsp

@@ -1,7 +1,7 @@
 <%@ page   language="java"  import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ taglib prefix="spring"  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
+<%@ taglib 	prefix="s" 		uri="http://sso.maxkey.org/tags" %>
 
 <table width="100%">
   <tr>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/mobile.jsp

@@ -1,7 +1,7 @@
 <%@ page   language="java"  import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ taglib prefix="spring"  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
+<%@ taglib 	prefix="s" 		uri="http://sso.maxkey.org/tags" %>
 
 <table width="100%">
   <tr>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/question.jsp

@@ -1,7 +1,7 @@
-<%@ page    language="java"  import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ taglib  prefix="spring"  uri="http://www.springframework.org/tags" %>
-<%@ taglib  prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
+<%@ page    language="java"  	import="java.util.*"   pageEncoding="UTF-8"%>
+<%@ taglib  prefix="spring"  	uri="http://www.springframework.org/tags" %>
+<%@ taglib  prefix="fmt"     	uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib 	prefix="s" 			uri="http://sso.maxkey.org/tags" %>
 <%@ taglib  prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <table width="100%">
   <tr>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/setting.jsp

@@ -1,7 +1,7 @@
 <%@ page    language="java"  import="java.util.*"   pageEncoding="UTF-8"%>
 <%@ taglib  prefix="spring"  uri="http://www.springframework.org/tags" %>
 <%@ taglib  prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib 	prefix="s" 		 uri="http://www.connsec.com/tags" %>
+<%@ taglib 	prefix="s" 		 uri="http://sso.maxkey.org/tags" %>
 <%@ taglib  prefix="c"       uri="http://java.sun.com/jsp/jstl/core"  %>
 
 <table width="100%">

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/social/socialSignOnProvider.jsp

@@ -3,7 +3,7 @@
 <%@ page   import="org.maxkey.web.*"%>
 <%@ taglib prefix="spring"  uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
+<%@ taglib 	prefix="s" 		uri="http://sso.maxkey.org/tags" %>
 <%@ taglib prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <%@ taglib prefix="fn"     	 	uri="http://java.sun.com/jsp/jstl/functions" %>
 <%if(WebContext.getUserInfo().getGridList()==0) {%>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/timeout.jsp

@@ -1,6 +1,6 @@
 <%@page session="false" %>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@taglib prefix="s" 		uri="http://www.connsec.com/tags" %> 
+<%@taglib prefix="s" 		uri="http://sso.maxkey.org/tags" %> 
 <!DOCTYPE HTML >
 <html>
   <head>

maxkey-webs/maxkey-web-maxkey/src/main/webapp/WEB-INF/web.xml

@@ -178,8 +178,8 @@
   	<!--used jsp Tag -->
    <jsp-config>
       <taglib>
-         <taglib-uri>http://www.connsec.com/tags</taglib-uri>
-         <taglib-location>/WEB-INF/tags/connsecTag.tld</taglib-location>
+         <taglib-uri>http://sso.maxkey.org/tags</taglib-uri>
+         <taglib-location>/WEB-INF/tags/maxkeyTag.tld</taglib-location>
       </taglib>
       <taglib>
          <taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri>