Index: .idea/compiler.xml =================================================================== diff -u -r054ab935c38d93d403895496ee460bacc451c635 -r37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5 --- .idea/compiler.xml (.../compiler.xml) (revision 054ab935c38d93d403895496ee460bacc451c635) +++ .idea/compiler.xml (.../compiler.xml) (revision 37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5) @@ -84,7 +84,7 @@ - + Index: development-project/project-standard/standard-server/pom.xml =================================================================== diff -u -rb199cdaab484064d85542e4db46420ef97a3bc48 -r37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5 --- development-project/project-standard/standard-server/pom.xml (.../pom.xml) (revision b199cdaab484064d85542e4db46420ef97a3bc48) +++ development-project/project-standard/standard-server/pom.xml (.../pom.xml) (revision 37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5) @@ -109,7 +109,7 @@ UTF-8 http://ubuntu.313.co.kr:58080/manager/text StandardProject-Snapshot - / + /test org.apache.coyote.http11.Http11NioProtocol Index: development-project/project-standard/standard-server/src/main/resources/egovframework/spring/com/context-security.xml =================================================================== diff -u -rb199cdaab484064d85542e4db46420ef97a3bc48 -r37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5 --- development-project/project-standard/standard-server/src/main/resources/egovframework/spring/com/context-security.xml (.../context-security.xml) (revision b199cdaab484064d85542e4db46420ef97a3bc48) +++ development-project/project-standard/standard-server/src/main/resources/egovframework/spring/com/context-security.xml (.../context-security.xml) (revision 37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5) @@ -1,127 +1,78 @@ - + + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + - + - + dataSource="egov.dataSource" + jdbcUsersByUsernameQuery="SELECT USER_ID, ESNTL_ID AS PASSWORD, 1 ENABLED, USER_NM, USER_ZIP, + USER_ADRES, USER_EMAIL, USER_SE, ORGNZT_ID, ESNTL_ID, + (select a.ORGNZT_NM from COMTNORGNZTINFO a where a.ORGNZT_ID = m.ORGNZT_ID) ORGNZT_NM + FROM COMVNUSERMASTER m WHERE CONCAT(USER_SE, USER_ID) = ?" + jdbcAuthoritiesByUsernameQuery="SELECT A.SCRTY_DTRMN_TRGET_ID USER_ID, A.AUTHOR_CODE AUTHORITY + FROM COMTNEMPLYRSCRTYESTBS A, COMVNUSERMASTER B + WHERE A.SCRTY_DTRMN_TRGET_ID = B.ESNTL_ID AND B.USER_ID = ?" + jdbcMapClass="egovframework.com.sec.security.common.EgovSessionMapping" - - + requestMatcherType="regex" + hash="plaintext" + hashBase64="false" - - - - - + concurrentMaxSessons="1" + concurrentExpiredUrl="/EgovContent.do" - - - - - - - - + defaultTargetUrl="/egovIndex.do" + /> + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + FishEye: Tag 37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5 refers to a dead (removed) revision in file `development-project/project-standard/standard-server/src/main/resources/egovframework/spring/com/context-security.xml.bak'. FishEye: No comparison available. Pass `N' to diff? Index: development-project/project-standard/standard-server/src/main/resources/egovframework/spring/com/context-security.xml.new =================================================================== diff -u --- development-project/project-standard/standard-server/src/main/resources/egovframework/spring/com/context-security.xml.new (revision 0) +++ development-project/project-standard/standard-server/src/main/resources/egovframework/spring/com/context-security.xml.new (revision 37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5) @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file FishEye: Tag 168267305d4b28d6f00223705d3d7a19bc42436a refers to a dead (removed) revision in file `development-project/project-standard/standard-server/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-social.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5 refers to a dead (removed) revision in file `development-project/project-standard/standard-server/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-social.xml.bak'. FishEye: No comparison available. Pass `N' to diff? Index: development-project/project-standard/standard-server/src/main/webapp/WEB-INF/web.xml =================================================================== diff -u -r168267305d4b28d6f00223705d3d7a19bc42436a -r37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5 --- development-project/project-standard/standard-server/src/main/webapp/WEB-INF/web.xml (.../web.xml) (revision 168267305d4b28d6f00223705d3d7a19bc42436a) +++ development-project/project-standard/standard-server/src/main/webapp/WEB-INF/web.xml (.../web.xml) (revision 37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5) @@ -229,7 +229,7 @@ - EgovSpringSecurityLogoutFilter egovframework.com.sec.security.filter.EgovSpringSecurityLogoutFilter @@ -238,8 +238,8 @@ EgovSpringSecurityLogoutFilter /j_spring_security_logout - --> - EgovSpringSecurityLoginFilter egovframework.com.sec.security.filter.EgovSpringSecurityLoginFilter @@ -258,7 +258,6 @@ EgovSpringSecurityLoginFilter *.do - --> Index: development-project/project-standard/standard-web/pom.xml =================================================================== diff -u -rfd8f40dae8e5c0c4b7848ae381863c44746e5a30 -r37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5 --- development-project/project-standard/standard-web/pom.xml (.../pom.xml) (revision fd8f40dae8e5c0c4b7848ae381863c44746e5a30) +++ development-project/project-standard/standard-web/pom.xml (.../pom.xml) (revision 37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5) @@ -74,16 +74,16 @@ 80 / - -Xms256m -Xmx768m -XX:MaxPermSize=256m + -Xms512m -Xmx768m -XX:MaxPermSize=256m org.apache.maven.plugins maven-compiler-plugin - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -101,132 +101,66 @@ - hsqldb + org.hsqldb hsqldb 2.3.2 - - - org.codehaus.mojo - emma-maven-plugin - 1.0-alpha-3 - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.1 - - org.apache.maven.plugins - maven-surefire-plugin + maven-war-plugin + 2.6 - false - once - xml - - **/Abstract*.java - **/*Suite.java - - - **/*Test.java - + false + + + false + + + ${maven.build.timestamp} + default + ${user.name} + Maven 3.0.5 + ${java.version} + ${os.name} + ${project.version} + ${basedir} + Korea Standard Project + + org.apache.tomcat.maven tomcat7-maven-plugin 2.2 + + + deploy + + redeploy + + + - http://192.168.100.251:8086/manager/text - tomcat - tomcat - / - target\standard-web.war + + + + UTF-8 + UTF-8 + http://ubuntu.313.co.kr:58080/manager/text + StandardProject-Snapshot + /test + org.apache.coyote.http11.Http11NioProtocol true - - org.codehaus.mojo - emma-maven-plugin - true - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - ${basedir}/target/site - - - maven-project-info-reports-plugin - 2.7 - - - sunlink - - javadoc - - true - - - http://docs.oracle.com/javase/6/docs/api/ - - - - - - - - org.codehaus.mojo - emma-maven-plugin - true - - - org.codehaus.mojo - surefire-report-maven-plugin - true - - - - report-only - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - 128m - 512m - ${encoding} - ${encoding} - ${encoding} - - - - - maven-jxr-plugin - - ${encoding} - ${encoding} - true - apidocs - - - - + Index: development-project/project-standard/standard-web/standard-web.iml =================================================================== diff -u -rfd8f40dae8e5c0c4b7848ae381863c44746e5a30 -r37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5 --- development-project/project-standard/standard-web/standard-web.iml (.../standard-web.iml) (revision fd8f40dae8e5c0c4b7848ae381863c44746e5a30) +++ development-project/project-standard/standard-web/standard-web.iml (.../standard-web.iml) (revision 37a6a7f1d1bc07e47bce6cbfeafe3e87d81965a5) @@ -12,7 +12,7 @@ - +