From 803be9a3f4675489c14858d6e155039177fe65ff Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Thu, 5 Aug 2021 16:12:47 +0800
Subject: [PATCH] maxkey.xml removed

---
 .../main/java/org/maxkey/MaxKeyConfig.java    |  1 -
 .../src/main/resources/spring/maxkey-mgt.xml  | 70 -------------------
 2 files changed, 71 deletions(-)
 delete mode 100644 maxkey-webs/maxkey-web-mgt/src/main/resources/spring/maxkey-mgt.xml

diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
index ec19b9a49..640ec6cf1 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
@@ -68,7 +68,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 @Configuration
-//@ImportResource(locations = { "classpath:spring/maxkey.xml" })
 @PropertySource(ConstantsProperties.applicationPropertySource)
 @ComponentScan(basePackages = {
         "org.maxkey.configuration",
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/spring/maxkey-mgt.xml b/maxkey-webs/maxkey-web-mgt/src/main/resources/spring/maxkey-mgt.xml
deleted file mode 100644
index 53d24ab50..000000000
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/spring/maxkey-mgt.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans 	xmlns="http://www.springframework.org/schema/beans"
-		xmlns:context="http://www.springframework.org/schema/context"
-		xmlns:mvc="http://www.springframework.org/schema/mvc"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns:p="http://www.springframework.org/schema/p"
-		xmlns:tx="http://www.springframework.org/schema/tx"
-		xmlns:util="http://www.springframework.org/schema/util"
-		xsi:schemaLocation="
-	        http://www.springframework.org/schema/beans     
-	        http://www.springframework.org/schema/beans/spring-beans.xsd
-	        http://www.springframework.org/schema/context 
-	        http://www.springframework.org/schema/context/spring-context.xsd
-	        http://www.springframework.org/schema/tx 
-	        http://www.springframework.org/schema/tx/spring-tx.xsd
-	        http://www.springframework.org/schema/util     
-	        http://www.springframework.org/schema/util/spring-util.xsd
-	        http://www.springframework.org/schema/mvc 
-	        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-    <bean id="tfaOptAuthn" class="org.maxkey.crypto.password.opt.impl.TimeBasedOtpAuthn">
-    </bean>
-    
-    <!-- LDAP Realm 
-    <bean id="authenticationRealm" class="org.maxkey.web.authentication.realm.ldap.LdapAuthenticationRealm">
-        <constructor-arg ref="jdbcTemplate"/>
-        <property name="ldapServers">
-            <list>
-                <bean id="ldapServer1" class="org.maxkey.web.authentication.realm.ldap.LdapServer">
-                    <property name="ldapUtils">
-                        <bean id="ldapUtils" class="org.maxkey.ldap.LdapUtils">
-                            <property name="providerUrl" value="ldap://localhost:389"></property>
-                            <property name="principal" value="cn=root"></property>
-                            <property name="credentials" value="rootroot"></property>
-                            <property name="baseDN" value="dc=connsec,dc=com"></property>
-                        </bean>
-                    </property>
-                    <property name="filterAttribute" value="uid"></property>
-                </bean> 
-            </list>
-        </property>
-    </bean> -->
-    
-    <!-- Active Directory  Realm 
-    <bean id="authenticationRealm" class="org.maxkey.web.authentication.realm.activedirectory.ActiveDirectoryAuthenticationRealm">
-        <constructor-arg ref="jdbcTemplate"/>
-        <property name="activeDirectoryServers">
-            <list>
-                <bean id="activeDirectory1" class="org.maxkey.web.authentication.realm.activedirectory.ActiveDirectoryServer">
-                    <property name="activeDirectoryUtils">
-                        <bean id="ldapUtils" class="org.maxkey.ldap.ActiveDirectoryUtils">
-                            <property name="providerUrl" value="ldap://localhost:389"></property>
-                            <property name="principal" value="cn=root"></property>
-                            <property name="credentials" value="rootroot"></property>
-                            <property name="domain" value="connsec"></property>
-                        </bean>
-                    </property>
-                </bean> 
-            </list>
-        </property>
-    </bean> -->
-    
-    <!-- Default Realm-->
-    <!-- realm use jdbc -->
-    <bean id="authenticationRealm" class="org.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm">
-        <constructor-arg ref="jdbcTemplate"/>
-    </bean>
-
-	
-</beans>
\ No newline at end of file