Index: .idea/artifacts/standard_portal_war.xml =================================================================== diff -u -r97889219b891ea73bdb5ea585f1907940e9b8ecc -rf831a341fcc7067f6bb0bba82c85c95ab8f2fbce --- .idea/artifacts/standard_portal_war.xml (.../standard_portal_war.xml) (revision 97889219b891ea73bdb5ea585f1907940e9b8ecc) +++ .idea/artifacts/standard_portal_war.xml (.../standard_portal_war.xml) (revision f831a341fcc7067f6bb0bba82c85c95ab8f2fbce) @@ -1,7 +1,7 @@ $PROJECT_DIR$/development-project/project-standard/standard-portal/target - + Index: .idea/artifacts/standard_portal_war_exploded.xml =================================================================== diff -u -r97889219b891ea73bdb5ea585f1907940e9b8ecc -rf831a341fcc7067f6bb0bba82c85c95ab8f2fbce --- .idea/artifacts/standard_portal_war_exploded.xml (.../standard_portal_war_exploded.xml) (revision 97889219b891ea73bdb5ea585f1907940e9b8ecc) +++ .idea/artifacts/standard_portal_war_exploded.xml (.../standard_portal_war_exploded.xml) (revision f831a341fcc7067f6bb0bba82c85c95ab8f2fbce) @@ -1,6 +1,6 @@ - $PROJECT_DIR$/development-project/project-standard/standard-portal/target/pst_webapp + $PROJECT_DIR$/development-project/project-standard/standard-portal/target/portal @@ -52,6 +52,7 @@ + @@ -67,12 +68,11 @@ - - + FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__asm_asm_3_1.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__cglib_cglib_2_2.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__com_ibm_icu_icu4j_4_8.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_3.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__commons_digester_commons_digester_1_6.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_2.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__commons_io_commons_io_2_0_1.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__commons_validator_commons_validator_1_3_1.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__egovframework_rte_egovframework_rte_fdl_cmmn_2_7_0.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__egovframework_rte_egovframework_rte_fdl_idgnr_2_7_0.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__egovframework_rte_egovframework_rte_fdl_logging_2_7_0.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__egovframework_rte_egovframework_rte_fdl_property_2_7_0.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__egovframework_rte_egovframework_rte_fdl_security_2_7_0.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__egovframework_rte_egovframework_rte_fdl_string_2_7_0.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__egovframework_rte_egovframework_rte_psl_dataaccess_2_7_0.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__egovframework_rte_egovframework_rte_ptl_mvc_2_7_0.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__log4j_log4j_1_3alpha_8.xml'. FishEye: No comparison available. Pass `N' to diff? Index: .idea/libraries/Maven__mysql_mysql_connector_java_5_1_17.xml =================================================================== diff -u --- .idea/libraries/Maven__mysql_mysql_connector_java_5_1_17.xml (revision 0) +++ .idea/libraries/Maven__mysql_mysql_connector_java_5_1_17.xml (revision f831a341fcc7067f6bb0bba82c85c95ab8f2fbce) @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__net_sf_log4jdbc3_1_1.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_apache_commons_commons_compress_1_1.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_aspectj_aspectjrt_1_6_9.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_aspectj_aspectjweaver_1_6_11.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_jdom_jdom_1_1.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_mybatis_mybatis_3_2_1.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_0.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_slf4j_slf4j_api_1_5_11.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_5_11.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_security_spring_security_acl_2_0_4.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_security_spring_security_core_2_0_4.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_security_spring_security_core_tiger_2_0_4.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_security_spring_security_taglibs_2_0_4.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_aop_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_asm_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_beans_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_context_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_context_support_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_core_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_expression_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_jdbc_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_orm_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_support_2_0_8.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_test_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_tx_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_web_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_springframework_spring_webmvc_3_0_5_RELEASE.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__taglibs_standard_1_1_2.xml'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 23b8d85bf87ee5172942dab6565628a651575e59 refers to a dead (removed) revision in file `.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml'. FishEye: No comparison available. Pass `N' to diff? Index: .idea/modules.xml =================================================================== diff -u -r23b8d85bf87ee5172942dab6565628a651575e59 -rf831a341fcc7067f6bb0bba82c85c95ab8f2fbce --- .idea/modules.xml (.../modules.xml) (revision 23b8d85bf87ee5172942dab6565628a651575e59) +++ .idea/modules.xml (.../modules.xml) (revision f831a341fcc7067f6bb0bba82c85c95ab8f2fbce) @@ -5,6 +5,7 @@ + Index: .idea/sonarIssues.xml =================================================================== diff -u -rbd8423fb7f1465bf56b4d2759db2cdeba6e40f26 -rf831a341fcc7067f6bb0bba82c85c95ab8f2fbce --- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision bd8423fb7f1465bf56b4d2759db2cdeba6e40f26) +++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision f831a341fcc7067f6bb0bba82c85c95ab8f2fbce) @@ -478,16 +478,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: development-project/project-standard/pom.xml =================================================================== diff -u -r23b8d85bf87ee5172942dab6565628a651575e59 -rf831a341fcc7067f6bb0bba82c85c95ab8f2fbce --- development-project/project-standard/pom.xml (.../pom.xml) (revision 23b8d85bf87ee5172942dab6565628a651575e59) +++ development-project/project-standard/pom.xml (.../pom.xml) (revision f831a341fcc7067f6bb0bba82c85c95ab8f2fbce) @@ -18,6 +18,7 @@ ROOT Project Repository by 313 DEV GRP + standard-portal standard-server-support standard-server Index: development-project/project-standard/standard-portal/pom.xml =================================================================== diff -u -r97889219b891ea73bdb5ea585f1907940e9b8ecc -rf831a341fcc7067f6bb0bba82c85c95ab8f2fbce --- development-project/project-standard/standard-portal/pom.xml (.../pom.xml) (revision 97889219b891ea73bdb5ea585f1907940e9b8ecc) +++ development-project/project-standard/standard-portal/pom.xml (.../pom.xml) (revision f831a341fcc7067f6bb0bba82c85c95ab8f2fbce) @@ -17,13 +17,6 @@ server by 313 DEV GRP - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - 3.0.5.RELEASE 2.7.0 @@ -110,43 +103,7 @@ 1.1 - - - - - - - - - - - - - commons-io commons-io 2.0.1 @@ -186,36 +143,17 @@ - mysql - mysql-connector-java - 5.1.31 - - - com.oracle ojdbc6 11.2.0.2 - - - - - - - - - install ${basedir}/target - pst_webapp + portal @@ -263,144 +201,8 @@ - - - hsqldb - hsqldb - 1.8.0.7 - - - - - org.codehaus.mojo - emma-maven-plugin - 1.0-alpha-1 - - - - org.apache.maven.plugins - maven-pmd-plugin - 2.4 - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - once - xml - - **/Abstract*.java - **/*Suite.java - - - **/*Test.java - - - - - org.codehaus.mojo - emma-maven-plugin - true - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.5 - - - - ${basedir}/target/site - - - maven-project-info-reports-plugin - 2.0.1 - - - sunlink - - javadoc - - true - - - http://java.sun.com/j2se/1.5.0/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-portal/standard-portal.iml =================================================================== diff -u -r97889219b891ea73bdb5ea585f1907940e9b8ecc -rf831a341fcc7067f6bb0bba82c85c95ab8f2fbce --- development-project/project-standard/standard-portal/standard-portal.iml (.../standard-portal.iml) (revision 97889219b891ea73bdb5ea585f1907940e9b8ecc) +++ development-project/project-standard/standard-portal/standard-portal.iml (.../standard-portal.iml) (revision f831a341fcc7067f6bb0bba82c85c95ab8f2fbce) @@ -74,6 +74,7 @@ + @@ -91,7 +92,6 @@ - Index: development-project/project-standard/standard-server/standard-server.iml =================================================================== diff -u -r45440e06665841c816c5998756a7cb2fc3a4e252 -rf831a341fcc7067f6bb0bba82c85c95ab8f2fbce --- development-project/project-standard/standard-server/standard-server.iml (.../standard-server.iml) (revision 45440e06665841c816c5998756a7cb2fc3a4e252) +++ development-project/project-standard/standard-server/standard-server.iml (.../standard-server.iml) (revision f831a341fcc7067f6bb0bba82c85c95ab8f2fbce) @@ -28,7 +28,7 @@