Merge branch 'tolag3'

src/main/java/kcc/xxx/web/XxxController.java

@@ -15,15 +15,11 @@ public class XxxController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(XxxController.class);
 
-	// XXX 서비스단
 	@Resource(name = "XxxService")
 	private XxxService xxxService;
 	
-	/**
-	 * XXX 등록화면
-	 */
 	@RequestMapping("/xxx/xxxTest.do")
-	public String XxxRegist() throws Exception {
+	public String xxxTest() throws Exception {
 		
 		T_MEMBER tMember = new T_MEMBER();
 		
@@ -34,4 +30,13 @@ public class XxxController {
 		return null;
 	}
 	
+	
+	@RequestMapping("/xxx/xxxTest2.do")
+	public String xxxTest2() throws Exception {
+		
+		
+		
+		return null;
+	}
+	
 }

src/main/webapp/WEB-INF/lib/MagicDB.conf

@@ -1,36 +0,0 @@
-#------------------------------------------------
-#  MagicDB Module Configuration File
-#------------------------------------------------
-[GLOBAL]
-ID = plugin
-PWD = kRg/dHemliWHkzyLwAX1Zw==
-LOG = false
-LOGFILEPATH = /usr/local/MagicDB/logs
-LOGFILENAME = MagicDB
-
-# 0 : DEBUG ,1 : INFO ,2 : ERROR ,3 : WARN
-LOG_LEVEL = 2
-SERVER_NUM = 2
-IP01 = 192.168.39.185
-PORT01 = 51001
-IP02 = 192.168.39.186
-PORT02 = 51001
-
-#LOGPROPERTIES=D:/workspace/MDBMigrationCubrid/lib/log4j.properties
-
-# <20><><EFBFBD> HMAC <20><>
-#32bit APP_HASH = uGDvAIA8roDOBAmiPlb0hLbn0k6q63AqREVDHb2+nfs=
-#64bit APP_HASH = rspNT+R+iOUAyO4UKWk/iMAa2CJrSUh+0jBhT2mWHIE=
-APP_HASH = rspNT+R+iOUAyO4UKWk/iMAa2CJrSUh+0jBhT2mWHIE=
-APP_PATH = /home/oracle/MagicDB/lib/libMagicDB.so
-
-KCMV_MODE = false
-
-#LICENSE = /usr/local/MagicDB/conf/CAOSLib_MagicDB.lic
-LICENSE = /usr/local/MagicDB/conf/jcaos.lic
-
-ACC_IGNORE = true
-
-#FILE_POLICY = false
-#FILE_POLICY_NUM = 1
-#FILE_POLICY_NAME01 = D:\MagicDBAPI\bin\MAGICDB_POLICY.dat

src/main/webapp/WEB-INF/lib/MagicJCrypto-v2.0.0.0.jar.hmac

@@ -1 +0,0 @@
-af80dcebd9921df79a0e931d61d40d5316490814e348bea0df54a864dd39d45d

src/main/webapp/WEB-INF/lib/jcaos.lic

@@ -1 +0,0 @@
-MIIBDwQBMwQFSkNBT1MEEMfRsbnA+sDbscfAp7/4yLgEFkpUS1MtMDAwMDAtMjIxMTI5LTAzMjQwCAQABAAEAAQAMD4EDTIyMi4yMzEuNDMuNjYEDTIyMi4yMzEuNDMuNjkEDjE5Mi4xNjguMzkuMTg1BA4xOTIuMTY4LjM5LjE4NgQABIGAOTYyNjk5QkQ2RUNCOEIwNjg4MEFGMTA4NUZCN0Q4OTYwNEMxRTE4MDhBODIyQ0UzMDIxQjQxRjhEQ0ExMDVDRENCMDAwMDJBMUY5NjE2QUU5OUQ5MTgyRTQwOEI1RUQzQzFCMzQ4NUIxQTVCNzc2QzdGRERDNDdDRTU2QjIxOTCiCjAIBAAEAAQABAA=

src/main/webapp/WEB-INF/lib/magicline-e2e-4.0.0.0.jar.hmac

@@ -1 +0,0 @@
-04f949160cb67ebde5ca34b12869b1bd902dd5fdbdbc0ed7b23a1533fac47694