Skip to content

Commit 5206a8c

Browse files
committed
[TSF 의 설정파일을 META-INF로 이동했으나, 일부 파일을 못찾는 현상 해결 ]
[SmartCommit] SP-534 #close #time 1h +review SR @dongmin.lee #comment TSF의 설정 파일을 META-INF로 이동했으나, globals.properties를 찾지 못하는 현상이 발견되어 fix 중. [Document] http://www.313.co.kr/confluence/display/WIKI/1.0+jsTree+Service+Framework [IssueTracker] http://www.313.co.kr/jira/browse/SP-534 [VersionControl] https://github.com/jstree/jsTree-Service-Framework-Backend-App [CodeReview] http://www.313.co.kr/fecru/changelog/jsTreeServiceFrameworkBackendAppRepo [BuildManager] http://www.313.co.kr/bamboo/browse/STAN-RC [ArtifactManager] http://www.313.co.kr/nexus/content/repositories/StandardProject/ [CodeAnalysis] http://www.313.co.kr/sonar/dashboard/index/4772 [Docker] https://hub.docker.com/r/313devgrp/jstree-service-framework-backend-app/
1 parent ab84a98 commit 5206a8c

File tree

17 files changed

+115
-75
lines changed

17 files changed

+115
-75
lines changed

core-module/src/main/java/egovframework/com/cmm/service/EgovProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class EgovProperties {
3131

3232
public static final String RELATIVE_PATH_PREFIX = EgovProperties.class.getResource("").getPath().substring(0, EgovProperties.class.getResource("").getPath().lastIndexOf("com"));
3333

34-
public static final String GLOBALS_PROPERTIES_FILE = RELATIVE_PATH_PREFIX + "egovProps" + FILE_SEPARATOR + "globals.properties";
34+
public static final String GLOBALS_PROPERTIES_FILE = "/META-INF/"+ RELATIVE_PATH_PREFIX + "egovProps" + FILE_SEPARATOR + "globals.properties";
3535

3636
public static String getPathProperty(String keyName) {
3737
String value = "";

web-module/src/main/resources/egovframework/egovProps/globals.properties renamed to core-module/src/main/resources/META-INF/egovframework/egovProps/globals.properties

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,38 @@
1414
#-----------------------------------------------------------------------
1515

1616
# \uC6B4\uC601\uC11C\uBC84 \uD0C0\uC785(WINDOWS, UNIX)
17-
Globals.OsType = UNIX
17+
Globals.OsType=${profile.Globals.OsType}
1818

1919
# DB\uC11C\uBC84 \uD0C0\uC785(mysql, oracle) - datasource \uBC0F sqlMap \uD30C\uC77C \uC9C0\uC815\uC5D0 \uC0AC\uC6A9\uB428
20-
Globals.DbType = oracle
20+
Globals.DbType=${profile.Globals.DbType}
2121

2222
# Database configuration props
23-
database.driver=${database.driver}
24-
database.url=${database.url}
25-
database.username=${database.username}
26-
database.password=${database.password}
23+
database.driver=${profile.database.driver}
24+
database.url=${profile.database.url}
25+
database.username=${profile.database.username}
26+
database.password=${profile.database.password}
2727

2828
# hibernate props
29-
hibernate.dialect=${hibernate.dialect}
30-
hibernate.show.sql=${hibernate.show.sql}
31-
hibernate.hbm2ddl.auto=${hibernate.hbm2ddl.auto}
29+
hibernate.dialect=${profile.hibernate.dialect}
30+
hibernate.show.sql=${profile.hibernate.show.sql}
31+
hibernate.hbm2ddl.auto=${profile.hibernate.hbm2ddl.auto}
3232

3333
# facebook provider details
34-
facebook.api.key=${facebook.api.key}
35-
facebook.api.secret=${facebook.api.secret}
34+
facebook.api.key=${profile.facebook.api.key}
35+
facebook.api.secret=${profile.facebook.api.secret}
3636

3737
# twitter provider details
38-
twitter.api.key=${twitter.api.key}
39-
twitter.api.secret=${twitter.api.secret}
38+
twitter.api.key=${profile.twitter.api.key}
39+
twitter.api.secret=${profile.twitter.api.secret}
4040

4141
# linkedin provider details
42-
linkedin.api.key=${linkedin.api.key}
43-
linkedin.api.secret=${linkedin.api.secret}
42+
linkedin.api.key=${profile.linkedin.api.key}
43+
linkedin.api.secret=${profile.linkedin.api.secret}
4444

4545
# google provider details
46-
google.api.key=${google.api.key}
47-
google.api.secret=${google.api.secret}
46+
google.api.key=${profile.google.api.key}
47+
google.api.secret=${profile.google.api.secret}
4848

49-
Globals.fileStorePath = C:/egovframework/upload/
50-
Globals.SynchrnServerPath = C:/egovframework/upload/Synch/
51-
system.uploadpath = C:/egovframework/upload/
49+
Globals.fileStorePath=${profile.Globals.fileStorePath}
50+
Globals.SynchrnServerPath=${profile.Globals.SynchrnServerPath}
51+
system.uploadpath=${profile.Globals.uploadpath}

core-module/src/main/resources/META-INF/egovframework/spring/com/context-common.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<bean id="messageSource" class="egovframework.com.cmm.util.EgovWildcardReloadableResourceBundleMessageSource">
1616
<property name="egovBasenames">
1717
<list>
18-
<value>classpath*:egovframework/message/com/**/*</value>
18+
<value>classpath*:/META-INF/egovframework/message/com/**/*</value>
1919
<value>classpath:/egovframework/rte/fdl/idgnr/messages/idgnr</value>
2020
<value>classpath:/egovframework/rte/fdl/property/messages/properties</value>
21-
<value>classpath:/egovframework/egovProps/globals</value>
21+
<value>classpath:/META-INF/egovframework/egovProps/globals</value>
2222
</list>
2323
</property>
2424
<property name="cacheSeconds">

core-module/src/main/resources/META-INF/egovframework/spring/com/context-sqlMap.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<bean id="egov.propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
66
<property name="locations">
77
<list>
8-
<value>classpath:/egovframework/egovProps/globals.properties</value>
8+
<value>classpath:/META-INF/egovframework/egovProps/globals.properties</value>
99
</list>
1010
</property>
1111
</bean>
@@ -16,11 +16,10 @@
1616
<!-- Mybatis setup for Mybatis Database Layer -->
1717
<bean id="egov.sqlSession" class="org.mybatis.spring.SqlSessionFactoryBean">
1818
<property name="dataSource" ref="dataSource"/>
19-
<property name="configLocation" value="classpath:/egovframework/sqlmap/config/sql-map-config.xml" />
20-
19+
<property name="configLocation" value="classpath:/META-INF/egovframework/sqlmap/config/sql-map-config.xml" />
2120
<property name="mapperLocations">
2221
<list>
23-
<value>classpath:/egovframework/sqlmap/com/**/*_${Globals.DbType}.xml</value>
22+
<value>classpath:/META-INF/egovframework/sqlmap/com/**/*_${Globals.DbType}.xml</value>
2423
</list>
2524
</property>
2625
</bean>
@@ -29,7 +28,7 @@
2928
<bean id="egov.sqlMapClient" class="egovframework.rte.psl.orm.ibatis.SqlMapClientFactoryBean">
3029
<property name="configLocations">
3130
<list>
32-
<value>classpath:/egovframework/sqlmap/config/${Globals.DbType}/*.xml</value>
31+
<value>classpath:/META-INF/egovframework/sqlmap/config/${Globals.DbType}/*.xml</value>
3332
</list>
3433
</property>
3534
<property name="dataSource" ref="egov.dataSource"/>

0 commit comments

Comments
 (0)