diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java
index 7a4b25bed..83a1a41e8 100644
--- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java
+++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java
@@ -102,15 +102,15 @@ public class TokenBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{
//
//cookie.setDomain("."+applicationConfig.getSubDomainName());
//tomcat 8.5
- cookie.setDomain(applicationConfig.getSubDomainName());
+ cookie.setDomain(applicationConfig.getDomainName());
- _logger.debug("Sub Domain Name : "+"."+applicationConfig.getSubDomainName());
+ _logger.debug("Sub Domain Name : "+"."+applicationConfig.getDomainName());
response.addCookie(cookie);
- if(tokenBasedDetails.getRedirectUri().indexOf(applicationConfig.getSubDomainName())>-1){
+ if(tokenBasedDetails.getRedirectUri().indexOf(applicationConfig.getDomainName())>-1){
return WebContext.redirect(tokenBasedDetails.getRedirectUri());
}else{
- _logger.error(tokenBasedDetails.getRedirectUri()+" not in domain "+applicationConfig.getSubDomainName());
+ _logger.error(tokenBasedDetails.getRedirectUri()+" not in domain "+applicationConfig.getDomainName());
return null;
}
}
diff --git a/maxkey-web-manage/src/main/webapp/WEB-INF/web.backup.xml b/maxkey-web-manage/src/main/webapp/WEB-INF/web.backup.xml
new file mode 100644
index 000000000..e06b34325
--- /dev/null
+++ b/maxkey-web-manage/src/main/webapp/WEB-INF/web.backup.xml
@@ -0,0 +1,169 @@
+
+
+
+ MaxKey Management
+
+
+ webAppRootKey
+ org.maxkey.management.root
+
+
+
+ InitWebContext
+ org.maxkey.web.InitWebContext
+ 1
+
+
+
+
+
+ contextConfigLocation
+ /WEB-INF/spring/maxkey-mgt.xml
+
+
+
+
+ log4jRefreshInterval
+ 60000
+
+
+
+ org.springframework.web.context.request.RequestContextListener
+
+
+ org.springframework.web.context.ContextLoaderListener
+
+
+ org.springframework.web.util.IntrospectorCleanupListener
+
+
+
+
+ isLog4jAutoInitializationDisabled
+ false
+
+
+
+ log4jConfiguration
+ classpath:log4j2.xml
+
+
+
+
+ org.apache.logging.log4j.web.Log4jServletContextListener
+
+
+
+ log4jServletFilter
+ org.apache.logging.log4j.web.Log4jServletFilter
+
+
+ log4jServletFilter
+ /*
+ REQUEST
+ FORWARD
+ INCLUDE
+ ERROR
+
+
+
+ characterEncodingFilter
+ org.springframework.web.filter.CharacterEncodingFilter
+
+ encoding
+ UTF-8
+
+
+ forceEncoding
+ true
+
+
+
+ characterEncodingFilter
+ /*
+
+
+
+
+ maxkey-mgt
+ org.springframework.web.servlet.DispatcherServlet
+ 1
+
+
+ maxkey-mgt
+ /
+
+
+ HiddenHttpMethodFilter
+ org.springframework.web.filter.HiddenHttpMethodFilter
+
+
+ HiddenHttpMethodFilter
+ maxkey-mgt
+
+
+
+
+ 30
+
+
+
+
+ 401
+ /WEB-INF/view/exception/accessdeny.jsp
+
+
+
+ 403
+ /WEB-INF/view/exception/accessdeny.jsp
+
+
+
+ 404
+ /WEB-INF/view/exception/404.jsp
+
+
+
+ 500
+ /WEB-INF/view/exception/500.jsp
+
+
+
+ 501
+ /WEB-INF/view/exception/501.jsp
+
+
+
+ 503
+ /WEB-INF/view/exception/503.jsp
+
+
+
+
+
+ http://sso.maxkey.org/tags
+ /WEB-INF/tags/maxkeyTag.tld
+
+
+ http://java.sun.com/jsp/jstl/core
+ /WEB-INF/tags/c.tld
+
+
+
diff --git a/maxkey-web-manage/src/main/webapp/WEB-INF/web.xml b/maxkey-web-manage/src/main/webapp/WEB-INF/web.xml
index e06b34325..0e1f8b09b 100644
--- a/maxkey-web-manage/src/main/webapp/WEB-INF/web.xml
+++ b/maxkey-web-manage/src/main/webapp/WEB-INF/web.xml
@@ -14,156 +14,4 @@
org.maxkey.management.root
-
- InitWebContext
- org.maxkey.web.InitWebContext
- 1
-
-
-
-
-
- contextConfigLocation
- /WEB-INF/spring/maxkey-mgt.xml
-
-
-
-
- log4jRefreshInterval
- 60000
-
-
-
- org.springframework.web.context.request.RequestContextListener
-
-
- org.springframework.web.context.ContextLoaderListener
-
-
- org.springframework.web.util.IntrospectorCleanupListener
-
-
-
-
- isLog4jAutoInitializationDisabled
- false
-
-
-
- log4jConfiguration
- classpath:log4j2.xml
-
-
-
-
- org.apache.logging.log4j.web.Log4jServletContextListener
-
-
-
- log4jServletFilter
- org.apache.logging.log4j.web.Log4jServletFilter
-
-
- log4jServletFilter
- /*
- REQUEST
- FORWARD
- INCLUDE
- ERROR
-
-
-
- characterEncodingFilter
- org.springframework.web.filter.CharacterEncodingFilter
-
- encoding
- UTF-8
-
-
- forceEncoding
- true
-
-
-
- characterEncodingFilter
- /*
-
-
-
-
- maxkey-mgt
- org.springframework.web.servlet.DispatcherServlet
- 1
-
-
- maxkey-mgt
- /
-
-
- HiddenHttpMethodFilter
- org.springframework.web.filter.HiddenHttpMethodFilter
-
-
- HiddenHttpMethodFilter
- maxkey-mgt
-
-
-
-
- 30
-
-
-
-
- 401
- /WEB-INF/view/exception/accessdeny.jsp
-
-
-
- 403
- /WEB-INF/view/exception/accessdeny.jsp
-
-
-
- 404
- /WEB-INF/view/exception/404.jsp
-
-
-
- 500
- /WEB-INF/view/exception/500.jsp
-
-
-
- 501
- /WEB-INF/view/exception/501.jsp
-
-
-
- 503
- /WEB-INF/view/exception/503.jsp
-
-
-
-
-
- http://sso.maxkey.org/tags
- /WEB-INF/tags/maxkeyTag.tld
-
-
- http://java.sun.com/jsp/jstl/core
- /WEB-INF/tags/c.tld
-
-
diff --git a/maxkey-web-manage/src/main/webapp/index.jsp b/maxkey-web-manage/src/main/webapp/index.jsp
deleted file mode 100644
index 19be0ac7c..000000000
--- a/maxkey-web-manage/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-
-
-
- MaxKey Management
- "/>
-
-
-
-
-
diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/web.backup.xml b/maxkey-web-maxkey/src/main/webapp/WEB-INF/web.backup.xml
new file mode 100644
index 000000000..086263be9
--- /dev/null
+++ b/maxkey-web-maxkey/src/main/webapp/WEB-INF/web.backup.xml
@@ -0,0 +1,179 @@
+
+
+
+ MaxKey Single Sign On
+
+
+ webAppRootKey
+ org.maxkey.root
+
+
+
+ InitApplicationContext
+ org.maxkey.web.InitApplicationContext
+ 1
+
+
+
+
+
+ contextConfigLocation
+ classpath:spring/maxkey.xml
+
+
+
+
+ log4jRefreshInterval
+ 60000
+
+
+
+
+ isLog4jAutoInitializationDisabled
+ false
+
+
+
+ log4jConfiguration
+ classpath:log4j2.xml
+
+
+
+
+ org.apache.logging.log4j.web.Log4jServletContextListener
+
+
+
+ log4jServletFilter
+ org.apache.logging.log4j.web.Log4jServletFilter
+
+
+ log4jServletFilter
+ /*
+ REQUEST
+ FORWARD
+ INCLUDE
+ ERROR
+
+
+
+ characterEncodingFilter
+ org.springframework.web.filter.CharacterEncodingFilter
+
+ encoding
+ UTF-8
+
+
+ forceEncoding
+ true
+
+
+
+ characterEncodingFilter
+ /*
+
+
+
+
+ ipAddressFilter
+ org.maxkey.web.filter.IpAddressFilter
+
+
+ ipAddressFilter
+ /*
+
+
+
+
+ OAuth20TokenEndpointAuthenticationFilter
+ org.maxkey.authz.oauth2.provider.endpoint.TokenEndpointAuthenticationFilter
+
+
+ OAuth20TokenEndpointAuthenticationFilter
+ /oauth/v20/token
+
+
+
+
+ maxkey
+ org.springframework.web.servlet.DispatcherServlet
+ 1
+
+
+ maxkey
+ /
+
+
+ HiddenHttpMethodFilter
+ org.springframework.web.filter.HiddenHttpMethodFilter
+
+
+ HiddenHttpMethodFilter
+ maxkey
+
+
+
+
+ 30
+
+
+
+
+
diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/web.xml b/maxkey-web-maxkey/src/main/webapp/WEB-INF/web.xml
index a0d850564..876e1a04c 100644
--- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/web.xml
+++ b/maxkey-web-maxkey/src/main/webapp/WEB-INF/web.xml
@@ -7,183 +7,11 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- MaxKey security
+ MaxKey Single Sign On
webAppRootKey
org.maxkey.root
-
- InitWebContext
- org.maxkey.web.InitWebContext
- 1
-
-
-
-
-
- contextConfigLocation
- /WEB-INF/spring/maxkey.xml
-
-
-
-
- log4jRefreshInterval
- 60000
-
-
-
- org.springframework.web.context.request.RequestContextListener
-
-
- org.springframework.web.context.ContextLoaderListener
-
-
- org.springframework.web.util.IntrospectorCleanupListener
-
-
-
-
- isLog4jAutoInitializationDisabled
- false
-
-
-
- log4jConfiguration
- classpath:log4j2.xml
-
-
-
-
- org.apache.logging.log4j.web.Log4jServletContextListener
-
-
-
- log4jServletFilter
- org.apache.logging.log4j.web.Log4jServletFilter
-
-
- log4jServletFilter
- /*
- REQUEST
- FORWARD
- INCLUDE
- ERROR
-
-
-
- characterEncodingFilter
- org.springframework.web.filter.CharacterEncodingFilter
-
- encoding
- UTF-8
-
-
- forceEncoding
- true
-
-
-
- characterEncodingFilter
- /*
-
-
-
-
- ipAddressFilter
- org.maxkey.web.filter.IpAddressFilter
-
-
- ipAddressFilter
- /*
-
-
-
-
- OAuth20TokenEndpointAuthenticationFilter
- org.maxkey.authz.oauth2.provider.endpoint.TokenEndpointAuthenticationFilter
-
-
- OAuth20TokenEndpointAuthenticationFilter
- /oauth/v20/token
-
-
-
-
- maxkey
- org.springframework.web.servlet.DispatcherServlet
- 1
-
-
- maxkey
- /
-
-
- HiddenHttpMethodFilter
- org.springframework.web.filter.HiddenHttpMethodFilter
-
-
- HiddenHttpMethodFilter
- maxkey
-
-
-
-
- 30
-
-
-
-
- 401
- /WEB-INF/view/exception/accessdeny.jsp
-
-
-
- 403
- /WEB-INF/view/exception/accessdeny.jsp
-
-
-
- 404
- /WEB-INF/view/exception/404.jsp
-
-
-
- 500
- /WEB-INF/view/exception/500.jsp
-
-
-
- 501
- /WEB-INF/view/exception/501.jsp
-
-
-
- 503
- /WEB-INF/view/exception/503.jsp
-
-
-
-
-
- http://sso.maxkey.org/tags
- /WEB-INF/tags/maxkeyTag.tld
-
-
- http://java.sun.com/jsp/jstl/core
- /WEB-INF/tags/c.tld
-
-