Merge branch 'master' of

http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Conflicts:
	src/main/webapp/WEB-INF/clipreport4/crf/15_1_daytimeBusiness.crf

src/main/java/kcc/com/pdf/service/impl/PdfServiceImpl.java

@@ -30,6 +30,7 @@ import kcc.com.cmm.LoginVO;
 import kcc.com.pdf.service.PdfService;
 import kcc.com.pdf.service.PdfVO;
 import kcc.com.utl.fcc.service.EgovStringUtil;
+import seed.utils.SeedUtils;
 
 
 /*
@@ -204,7 +205,7 @@ public class PdfServiceImpl extends EgovAbstractServiceImpl implements PdfServic
     										{
     											
     											PdfVO.Options optionsFileBefore = new PdfVO.Options();
-    											optionsFileBefore.setMergeSrcUri(hostUri + "/gtm/case/pdfSubjectPop.do?caseNo=" + t.getCodeName());
+    											optionsFileBefore.setMergeSrcUri(hostUri + "/gtm/case/pdfSubjectPop.do?caseNo=" + SeedUtils.setReplaceNull(t.getCodeName()).replace(" ", "%20"));
     								    		PdfVO.Option optionFileBefore = new PdfVO.Option();
     								    		optionFileBefore.setLabel(t.getCodeName());
     								    		optionFileBefore.setHtmlUrlResource(true);

src/main/java/seed/utils/SeedProperties.java

@@ -16,6 +16,7 @@ public class SeedProperties {
 	private static String configPath = null;
 	private static File configFile = null;
 	private static long propertiesLastModifyTime = 0l;
+	private String springProfilesActive = System.getProperty("spring.profiles.active");
 	
 	public SeedProperties(){}
 	
@@ -39,7 +40,8 @@ public class SeedProperties {
 				System.out.println("index :"  + index);
 				if(index > 0) configPath = configPath.substring(0, index+7);
 				System.out.println("configPath2 :"  + configPath);
-				configPath = configPath + "/classes/config/seed/config.properties";
+				/*configPath = configPath + "/classes/config/seed/config.properties";*/
+				configPath = configPath + "/classes/egovframework/egovProps/globals_"+springProfilesActive+".properties";
 				System.out.println("configPath3 :"  + configPath);
 				System.out.println("configProperties load="+configPath);