diff --git a/commit.ref b/commit.ref index 0c28e74..755fae4 160000 --- a/commit.ref +++ b/commit.ref @@ -1 +1 @@ -Subproject commit 0c28e7458ca9cc527cb3849d6f1c2b57020f56c8 +Subproject commit 755fae41221fb2b02e7a78f797b181c45ba8e41e diff --git a/commit.yml b/commit.yml index 0efc75b..5ed61e5 100644 --- a/commit.yml +++ b/commit.yml @@ -2,220 +2,130 @@ branches: { } fileChange: - /README.md: - newFile: !uuid 'b432a11513f0d92489322d1e0d73df58c07cb29d' - oldFile: !uuid 'feed05654bebca9b3e85d81920ed50ccc2ddbc60' - /others: - newFile: !uuid '3cb3dec94ef1ec1acefb0b98c780ba4165049313' - oldFile: !uuid '9c588a47bc9cbfd3e8fedf3420333139c1f8dbdc' - /others/database: - newFile: !uuid '91d66926541a42d1a90590339335a731b930e738' - oldFile: !uuid '988d711c21ff7e0f402313e668fa40f94afb107a' - /others/database/initial_data.ddl: - newFile: !uuid '1bbed0a1f893044985cf35218f44c93c8647d572' - oldFile: !uuid 'd6e6d229ff2545dc978ad1b124a56b9e61b3057a' - /others/database/initial_db.ddl: - newFile: !uuid 'a488364fcbbb4560d3f710e59665dd7380502988' - oldFile: !uuid 'e916f8fc1cf8f95c5e7294375ae2cbc63b503cfd' - /pom.xml: - newFile: !uuid '938c44227ac5478167970e7a61fdd7d147e0bef0' - oldFile: !uuid 'ce19833143c087a21adb00317ad4f70730e4eb9e' /src: - newFile: !uuid '0e6df5bd01ae169d7ed39e5ab4408b689aa86c9e' - oldFile: !uuid '7e273bc4894b853120a58f0c8b481c874c545ef3' + newFile: !uuid '2b07249a565547e941c3a1849020e20b9f633302' + oldFile: !uuid '0e6df5bd01ae169d7ed39e5ab4408b689aa86c9e' /src/main: - newFile: !uuid 'd32da74010ffb10da0cd2945f6795b7306c62171' - oldFile: !uuid 'b8534e50cf334bbebf9d3ef727262093ee12df93' + newFile: !uuid '1285fb66765e37e751e22fa5758084ed450b7aae' + oldFile: !uuid 'd32da74010ffb10da0cd2945f6795b7306c62171' /src/main/java: - newFile: !uuid '941281ec8c28f4a88676fcaf8d48a4f3cf1513b0' - oldFile: !uuid 'b98086d84288423d69a85a1ac3e1e942c1b43464' + newFile: !uuid '0b34164da2e259d642f366b42209ad54e838646b' + oldFile: !uuid '941281ec8c28f4a88676fcaf8d48a4f3cf1513b0' /src/main/java/com: - newFile: !uuid '34dad5a31b490947f4f1cd3928cf42a8eea9e83c' - oldFile: !uuid '8f1fa93cec1a8372e538e28f1c78e3dd0de2df12' + newFile: !uuid 'de84e676a2a767c47b9c75aa2ccbbb7d2d22d38d' + oldFile: !uuid '34dad5a31b490947f4f1cd3928cf42a8eea9e83c' /src/main/java/com/monkeyk: - newFile: !uuid '83d271be054c491fd1820d8c2c38207383a66a1f' - oldFile: !uuid 'b4fc8128a2cca5c608fcf0086107886cedd0e7dd' + newFile: !uuid '06a84fc97423c933ee180a34fc8d284ce57d9f74' + oldFile: !uuid '83d271be054c491fd1820d8c2c38207383a66a1f' /src/main/java/com/monkeyk/sos: - newFile: !uuid '36d018351d60d2c8e4f8daec6b193f5d4e6ed666' - oldFile: !uuid '07957184a47c62a6eebdb09e4dd680a008bbb4a8' - /src/main/java/com/monkeyk/sos/SpringOauthServerServletInitializer.java: - newFile: !uuid 'be871eb3bab521037c30e10e6cee0b25490483fb' - oldFile: !uuid 'c97cd69088d981e6fe726a328270bd0ae189cf60' + newFile: !uuid '553737bbd537b93b080c3f1d7b9d5e487010ebb5' + oldFile: !uuid '36d018351d60d2c8e4f8daec6b193f5d4e6ed666' /src/main/java/com/monkeyk/sos/config: - newFile: !uuid '5f5223d733cff9d8cc63371e954f408b34a9edd8' - oldFile: !uuid 'b95a611f69e6f822d45f482330875f5f4ac04d48' + newFile: !uuid '7ec8ac1cf5d6cfde8344773f52d63d23bfca3017' + oldFile: !uuid '5f5223d733cff9d8cc63371e954f408b34a9edd8' /src/main/java/com/monkeyk/sos/config/MVCConfiguration.java: - newFile: !uuid '2d613384f17683f64cda9b5eb79db95348d1ff2f' - oldFile: null - /src/main/java/com/monkeyk/sos/config/OAuth2MethodSecurityConfiguration.java: - newFile: !uuid '70f5bd636aff01a8e0d9639af6d47844498d18e0' - oldFile: null - /src/main/java/com/monkeyk/sos/config/OAuth2ServerConfig.java: - newFile: null - oldFile: !uuid '77d7cb964f0bfcb71df505bf0b64d1a47520ae37' - /src/main/java/com/monkeyk/sos/config/OAuth2ServerConfiguration.java: - newFile: !uuid 'd7f576a9e9aea57a5de0ed1d62dcb5f9dca5b72d' - oldFile: null + newFile: !uuid 'f6ba5e72c792885bf9a6a68d6cfb373fea34ef55' + oldFile: !uuid '2d613384f17683f64cda9b5eb79db95348d1ff2f' /src/main/java/com/monkeyk/sos/config/WebSecurityConfigurer.java: - newFile: !uuid 'adf11bcd0d2cd5474887d90ea724d6dbf3cd1f13' - oldFile: !uuid '8c40c7c69b5c3901167c745561fc2429af51cb49' - /src/main/java/com/monkeyk/sos/domain: - newFile: !uuid '35f01fcc5593199b8f954ec2d97766e6efe485e8' - oldFile: !uuid 'fbb95fca45b865d99f690c4068a8e224e1296b4f' - /src/main/java/com/monkeyk/sos/domain/dto: - newFile: null - oldFile: !uuid '4980cbead33df534fd779dc969c7a064711560fe' - /src/main/java/com/monkeyk/sos/domain/dto/OauthClientDetailsDto.java: - newFile: null - oldFile: !uuid '137c0bde3de648d33577414feae4baf98efd0e39' - /src/main/java/com/monkeyk/sos/domain/dto/UserDto.java: - newFile: null - oldFile: !uuid '7ae5b1995d9dcc95c1084a84b9b22afc4a69d14c' - /src/main/java/com/monkeyk/sos/domain/dto/UserFormDto.java: - newFile: null - oldFile: !uuid '1fd4928bc1366e153e8b758244c2803452cc4164' - /src/main/java/com/monkeyk/sos/domain/dto/UserJsonDto.java: - newFile: null - oldFile: !uuid 'c6479087afac94e4a71b25d18eaf4d71e18d109e' - /src/main/java/com/monkeyk/sos/domain/dto/UserOverviewDto.java: - newFile: null - oldFile: !uuid '9fc57ce8855a144e3beb42d9c950fb5f18538344' - /src/main/java/com/monkeyk/sos/infrastructure: - newFile: !uuid '4dcb23b1dfaf98447a84504d37113f892a8a4725' - oldFile: !uuid 'ac790c96923b5767addc0fb1ea9ed208f49bcc3e' - /src/main/java/com/monkeyk/sos/infrastructure/PasswordHandler.java: - newFile: !uuid '85f36ab8677645cc393932a056e01371a83d0d27' - oldFile: !uuid 'b1a8d88eb290e1a5ef0c07b3ff4c509f1d230108' - /src/main/java/com/monkeyk/sos/service: - newFile: !uuid '1d58c0b54cb9032f16d194a5c9ce2f84a0fa58b8' - oldFile: !uuid '2f3c07d021357f4659ae050494762569001b105a' - /src/main/java/com/monkeyk/sos/service/OauthService.java: - newFile: !uuid '2730fe9e5b1a75ba729e9c81ce36d75ec7309ad0' - oldFile: !uuid '37fcb7db6eaa1053ffff59cc8ff47ac40f910850' - /src/main/java/com/monkeyk/sos/service/UserService.java: - newFile: !uuid 'c3ae7be7a117c10e1656ff182585b1f8f1f1a4b3' - oldFile: !uuid '51250e7ee76d32a242e2911aed4201f339137cb3' - /src/main/java/com/monkeyk/sos/service/dto: - newFile: !uuid 'afe2d098459b6eb207417cdc8468995fa565649a' - oldFile: null - /src/main/java/com/monkeyk/sos/service/dto/OauthClientDetailsDto.java: - newFile: !uuid '7a3839b3b2a4f17bd6e2735cbe67d5c373fdbccf' - oldFile: null - /src/main/java/com/monkeyk/sos/service/dto/UserDto.java: - newFile: !uuid 'b0eebd3617098ea6f0b0c74750754928f2b486be' - oldFile: null - /src/main/java/com/monkeyk/sos/service/dto/UserFormDto.java: - newFile: !uuid '1468c16ab359e962fe90820694412c06bb08ab93' - oldFile: null - /src/main/java/com/monkeyk/sos/service/dto/UserJsonDto.java: - newFile: !uuid '218499672abaa3d06e11829573e5e7e83e0941ef' - oldFile: null - /src/main/java/com/monkeyk/sos/service/dto/UserOverviewDto.java: - newFile: !uuid '18fcb38177ad79915a1f858a700c15a73809efce' - oldFile: null - /src/main/java/com/monkeyk/sos/service/impl: - newFile: !uuid 'd2b5ef212326e08aa9dae5050e0b5d0e8dbade15' - oldFile: !uuid 'cea3739cb64ea5b8f48646860e445ecfb042ac15' - /src/main/java/com/monkeyk/sos/service/impl/OauthServiceImpl.java: - newFile: !uuid '80077b4551f9008415fa381e577738580e9f9fd4' - oldFile: !uuid '97583a97810dbcaa8c571feca3308dc8bc878404' - /src/main/java/com/monkeyk/sos/service/impl/UserServiceImpl.java: - newFile: !uuid 'eeb6aab7c31202dfae6ad471adaac2b1b238a8bd' - oldFile: !uuid '9e50d0c0f76ecf0cf2d62aa62569b2fcdfdabff0' + newFile: !uuid 'fde52e73d63120fdeb48798066395ba4b19711c1' + oldFile: !uuid 'adf11bcd0d2cd5474887d90ea724d6dbf3cd1f13' /src/main/java/com/monkeyk/sos/web: - newFile: !uuid 'a9667d1db508679bae40c5da2147188a6977b904' - oldFile: !uuid '01a7113351089b44f8330fc5306bd843f5f00046' + newFile: !uuid '35222c56d785bd9710ea7bb0a91e24d0998d0408' + oldFile: !uuid 'a9667d1db508679bae40c5da2147188a6977b904' + /src/main/java/com/monkeyk/sos/web/WebUtils.java: + newFile: !uuid '7764b8e0bb021c07dcbc56d2755c92f301c2592f' + oldFile: !uuid '803f165bf18baaa7774396ee5443fd719f173d93' /src/main/java/com/monkeyk/sos/web/controller: - newFile: !uuid 'd58826f228ec2f07f18a66e1ace72c6e353ea031' - oldFile: !uuid 'e5fa30e61c52de863844738405ce578a42f72821' - /src/main/java/com/monkeyk/sos/web/controller/ClientDetailsController.java: - newFile: !uuid '4cdccf612582e92255b6f1179cc3079813b698d7' - oldFile: !uuid 'e2b59a009146c628b6b3159854f538b42184fb2d' - /src/main/java/com/monkeyk/sos/web/controller/OAuthRestController.java: - newFile: !uuid '99bbd3c5359345a3f16e754ae832c6453b06204f' - oldFile: !uuid '7f779e7b86c05b92188d05bdd484c96ba3ce0fc5' - /src/main/java/com/monkeyk/sos/web/controller/UserController.java: - newFile: !uuid '3f241ff839a46e737fc579d0f51d9170b8250ee7' - oldFile: !uuid 'a86459273bc1d8f372e201d764dbac40d9804ec5' - /src/main/java/com/monkeyk/sos/web/controller/UserFormDtoValidator.java: - newFile: !uuid '37245d91174cee57e40fed3c8556073a7f8294a3' - oldFile: !uuid '851add4aa9d5e22e103e9b6347701371676651d8' + newFile: !uuid 'd3924533920b5f8af9e9d8c1323997e49796845b' + oldFile: !uuid 'd58826f228ec2f07f18a66e1ace72c6e353ea031' + /src/main/java/com/monkeyk/sos/web/controller/SOSController.java: + newFile: !uuid '97c5d4ee7fada90e7013135ded119da40680ace6' + oldFile: null /src/main/java/com/monkeyk/sos/web/controller/mobile: - newFile: !uuid '622eff7c76f8e3623ca45dd6cc172c984266a116' - oldFile: !uuid 'fefdd3cc8a2e7ec849c57330452d5ccb6ce01d94' + newFile: null + oldFile: !uuid '622eff7c76f8e3623ca45dd6cc172c984266a116' /src/main/java/com/monkeyk/sos/web/controller/mobile/MobileController.java: - newFile: !uuid 'f4c78858d415d3a7bdec9f7f3f317696863739ac' - oldFile: !uuid '27b290edb97b4fc99bc839a698ea9500ce2902b4' + newFile: null + oldFile: !uuid 'f4c78858d415d3a7bdec9f7f3f317696863739ac' + /src/main/java/com/monkeyk/sos/web/controller/resource: + newFile: !uuid 'b3085e3b446774656f8c0528531a96d213348c33' + oldFile: null + /src/main/java/com/monkeyk/sos/web/controller/resource/MobileController.java: + newFile: !uuid '94aa39b3a577590ef5dcd4c1e70e765a56cb66dc' + oldFile: null + /src/main/java/com/monkeyk/sos/web/controller/resource/UnityController.java: + newFile: !uuid '9d23c0ea2559e644354fb35905e3e4d3af3b0068' + oldFile: null /src/main/java/com/monkeyk/sos/web/controller/unity: - newFile: !uuid '434d4abf7d4ac359ce251bf1bf381273c6301057' - oldFile: !uuid '71e357baae351f6f15e40cbfc4f4668b8197d66d' + newFile: null + oldFile: !uuid '434d4abf7d4ac359ce251bf1bf381273c6301057' /src/main/java/com/monkeyk/sos/web/controller/unity/UnityController.java: - newFile: !uuid '4bfc49179bea3b27a7cbe5786b74c5a06acc23b3' - oldFile: !uuid 'b333ba8b994068bbee5cb9b189f282c4bdbf456c' - /src/main/java/com/monkeyk/sos/web/filter: - newFile: !uuid 'e926c3a1d8f9581ae6bb4d4caf8d8e753b0d9e86' - oldFile: !uuid 'ccd09413730f67ae424221b7819155bcf1a53cf5' - /src/main/java/com/monkeyk/sos/web/filter/SOSSiteMeshFilter.java: - newFile: !uuid 'f8693dedca3780c551c4dc05e3122d8113af36ee' - oldFile: null - /src/main/java/com/monkeyk/sos/web/oauth: - newFile: !uuid 'ee0a94e77cfa0e93875e7a2c273ada73e450a2a1' - oldFile: !uuid '92d99e337288cba3ce31aebb109763a0c3a3bfbe' - /src/main/java/com/monkeyk/sos/web/oauth/OauthClientDetailsDtoValidator.java: - newFile: !uuid '34a1e9cf9cf07ca4c5855e9a48fd93ca04eba3b2' - oldFile: !uuid '37e7f8b4d3dc03aca0cf5999daffe4cd059e6f25' - /src/main/resources: - newFile: !uuid '904dd76610dc66d9dc5b87476db8725104ef91fd' - oldFile: !uuid 'e7f646ddf327772dff1fa0ab7ba526b594428ae5' - /src/main/resources/application.properties: - newFile: !uuid '160157f7d0dfa4641ff5ab59f8335e59f7c37358' - oldFile: !uuid '1022c0e11de86295f6c878d743bc0dfb03678efc' + newFile: null + oldFile: !uuid '4bfc49179bea3b27a7cbe5786b74c5a06acc23b3' /src/main/webapp: - newFile: !uuid '05072c410adb935a9e06cdbcd5f8491f54bb2b7a' - oldFile: !uuid '7f5990554ef89939ee1b128d3dcb7d99f9df8cfb' + newFile: !uuid 'a40e81a92c942987115cf96a16b6d21961173e3c' + oldFile: !uuid '05072c410adb935a9e06cdbcd5f8491f54bb2b7a' /src/main/webapp/WEB-INF: - newFile: !uuid 'f486edd42b5a485eec601b70b3ab3d0fbb44c538' - oldFile: !uuid 'e1907b7121c980432d33877ff54356df1f7838cf' - /src/main/webapp/WEB-INF/decorators.xml: - newFile: null - oldFile: !uuid '27d7f9cbb82d7b7c17428e972c2e53cd1b7d235b' - /src/main/webapp/WEB-INF/decorators.xml.old: - newFile: !uuid '27d7f9cbb82d7b7c17428e972c2e53cd1b7d235b' + newFile: !uuid '13fb562ca5ca21f6f36131f8ba8eaac53b990f95' + oldFile: !uuid 'f486edd42b5a485eec601b70b3ab3d0fbb44c538' + /src/main/webapp/WEB-INF/jsp: + newFile: !uuid 'ba38fb11279d2ab5e2da9bbed1f081cf6b842c73' + oldFile: !uuid '2c776ac05913614152d96aa43b27748dfded6ff9' + /src/main/webapp/WEB-INF/jsp/decorators: + newFile: !uuid '9b094517654d53451b5b151e29e625aab17ac760' + oldFile: !uuid '09b958d2c34c671012d60e5b7baf036119deecf9' + /src/main/webapp/WEB-INF/jsp/decorators/main.jsp: + newFile: !uuid 'c0d6984c0ad380c166d13e30096ddf8447efa532' + oldFile: !uuid 'ebc583c418df3c641932f02b1b74ccf18337a332' + /src/main/webapp/WEB-INF/jsp/index.jsp: + newFile: !uuid '9aa5dd21bbd9d0236fc694ee2b8003dad7df7714' oldFile: null - /src/main/webapp/WEB-INF/log4j.xml: - newFile: null - oldFile: !uuid '2125676ec957f4f76f0e32c6ada63f73807b7e69' - /src/main/webapp/WEB-INF/log4j.xml.old: - newFile: !uuid '2125676ec957f4f76f0e32c6ada63f73807b7e69' + /src/main/webapp/WEB-INF/jsp/login.jsp: + newFile: !uuid '566dc1811cca6d349103b4f06b59df017cd55e2d' oldFile: null - /src/test: - newFile: !uuid 'c8344308815b653534331e9ab8aad1fe30b162b8' - oldFile: !uuid '58419891016a7f09a39efbaea0e02df982f590a1' - /src/test/java: - newFile: !uuid 'b186f0c4b2415deadc35ff8be5ae7cee15abe2cf' - oldFile: !uuid '334e8893a3afc088b754f1159a21917c88113606' - /src/test/java/com: - newFile: !uuid '00c9e71e3536f7748d9272300ca0bd38fe8501cf' - oldFile: !uuid 'e644c8fe6c3c577962277bd685e0b6981e16dae6' - /src/test/java/com/monkeyk: - newFile: !uuid '8eaa8ded38e9f318b9ee803403aca1f2cb0ca520' - oldFile: !uuid '9020bd2498bcfb22749b22a88ed6ec18adbd12b3' - /src/test/java/com/monkeyk/sos: - newFile: !uuid 'e52fc853f099b929dfd9f660d6d56ad1670428d1' - oldFile: !uuid '9b04b14e5594ce572a3abd561a9a6a2ba87f31c0' - /src/test/java/com/monkeyk/sos/infrastructure: - newFile: !uuid '9a900a859d2fe1249cdf7cc630a20ff485b949e3' - oldFile: !uuid 'ee356cc3ec7d2ebf593c056de9c88842fbf0f6f5' - /src/test/java/com/monkeyk/sos/infrastructure/PasswordHandlerTest.java: - newFile: !uuid 'b3cae00d682d6a5b9a2ab9ec8202c1de78d87b5a' - oldFile: !uuid 'e533215527ecb3b3de75418f3af58515527bd3a8' -gitCommitId: !uuid '0c28e7458ca9cc527cb3849d6f1c2b57020f56c8' + /src/main/webapp/WEB-INF/tags: + newFile: !uuid '03636aaea5c753bb21cdc8bccd1a6b20571f6b41' + oldFile: null + /src/main/webapp/WEB-INF/tags/csrf.tag: + newFile: !uuid 'f8f4bb99135ca568b99eca77aff1a442cfc21965' + oldFile: null + /src/main/webapp/index.jsp: + newFile: null + oldFile: !uuid '059fc5e6350912fbe1a41966df9f78368f14c284' + /src/main/webapp/login.jsp: + newFile: null + oldFile: !uuid '7ba3eddbd1a24150f2526fab4f2caecf1eef9f0f' + /src/main/webapp/resources: + newFile: null + oldFile: !uuid 'afc1cf0077a4a87895c6a182cf268cfff6eda436' + /src/main/webapp/resources/angular.min.js: + newFile: null + oldFile: !uuid 'ac033dc89bb07e48b89c99a681b3c8c768e9373b' + /src/main/webapp/resources/bootstrap.min.css: + newFile: null + oldFile: !uuid '46db47e4ace6638c403f1c26f08aa280784207db' + /src/main/webapp/resources/favicon.ico: + newFile: null + oldFile: !uuid '26d798de88313b1e60f65a967249b36022078d07' + /src/main/webapp/static: + newFile: !uuid 'd385e0d7a0b17c0ec648e99550cff0eac3965a8f' + oldFile: null + /src/main/webapp/static/angular.min.js: + newFile: !uuid 'ac033dc89bb07e48b89c99a681b3c8c768e9373b' + oldFile: null + /src/main/webapp/static/bootstrap.min.css: + newFile: !uuid 'cd1c616ad862823506143fda108e7caa2a58d1ed' + oldFile: null + /src/main/webapp/static/favicon.ico: + newFile: !uuid '26d798de88313b1e60f65a967249b36022078d07' + oldFile: null +gitCommitId: !uuid '755fae41221fb2b02e7a78f797b181c45ba8e41e' renames: - /src/main/java/com/monkeyk/sos/service/dto/OauthClientDetailsDto.java: /src/main/java/com/monkeyk/sos/domain/dto/OauthClientDetailsDto.java - /src/main/java/com/monkeyk/sos/service/dto/UserDto.java: /src/main/java/com/monkeyk/sos/domain/dto/UserDto.java - /src/main/java/com/monkeyk/sos/service/dto/UserFormDto.java: /src/main/java/com/monkeyk/sos/domain/dto/UserFormDto.java - /src/main/java/com/monkeyk/sos/service/dto/UserJsonDto.java: /src/main/java/com/monkeyk/sos/domain/dto/UserJsonDto.java - /src/main/java/com/monkeyk/sos/service/dto/UserOverviewDto.java: /src/main/java/com/monkeyk/sos/domain/dto/UserOverviewDto.java - /src/main/webapp/WEB-INF/decorators.xml.old: /src/main/webapp/WEB-INF/decorators.xml - /src/main/webapp/WEB-INF/log4j.xml.old: /src/main/webapp/WEB-INF/log4j.xml -revisionId: 220 + /src/main/java/com/monkeyk/sos/web/controller/resource/MobileController.java: /src/main/java/com/monkeyk/sos/web/controller/mobile/MobileController.java + /src/main/java/com/monkeyk/sos/web/controller/resource/UnityController.java: /src/main/java/com/monkeyk/sos/web/controller/unity/UnityController.java + /src/main/webapp/WEB-INF/jsp/index.jsp: /src/main/webapp/index.jsp + /src/main/webapp/WEB-INF/jsp/login.jsp: /src/main/webapp/login.jsp + /src/main/webapp/static/angular.min.js: /src/main/webapp/resources/angular.min.js + /src/main/webapp/static/bootstrap.min.css: /src/main/webapp/resources/bootstrap.min.css + /src/main/webapp/static/favicon.ico: /src/main/webapp/resources/favicon.ico +revisionId: 221