Commit Graph

586 Commits

Author SHA1 Message Date
René Pfeuffer
830c155b3d Fix transport protocol 2018-12-07 10:10:50 +01:00
René Pfeuffer
261e41f8bf Handle not existing revisions in merge 2018-12-07 08:49:37 +01:00
René Pfeuffer
540a525bc3 Use SCM protocol for internal merge command 2018-12-07 08:19:14 +01:00
René Pfeuffer
d889cf0831 Fix permission check 2018-12-05 17:25:10 +01:00
René Pfeuffer
35f73cdc18 Do not commit empty merges 2018-12-05 16:09:38 +01:00
René Pfeuffer
9a3b8c26fb Fix unit test 2018-12-05 16:01:34 +01:00
René Pfeuffer
8c9e38e395 Secure merge command 2018-12-05 15:32:30 +01:00
René Pfeuffer
3021bea65a Multiply floating store factories for type safety 2018-12-04 08:56:39 +01:00
René Pfeuffer
33f3216164 Make type optional 2018-12-03 16:30:19 +01:00
René Pfeuffer
44d99f55f2 Do no longer expose StoreParameters 2018-12-03 12:28:35 +01:00
René Pfeuffer
3638d3520f Use static method for new StoreParameters instance 2018-12-03 11:28:03 +01:00
Mohamed Karray
37f4a2b669 merge 2018-11-29 16:01:43 +01:00
Sebastian Sdorra
e9401624a7 re implement XmlRepositoryDAO 2018-11-28 19:49:55 +01:00
Mohamed Karray
fb79cbfd02 merge + refactor getStoreDirectory 2018-11-28 15:14:49 +01:00
René Pfeuffer
d4db39755f Harmonize repository resolution 2018-11-27 15:31:57 +01:00
Mohamed Karray
7a1de0f67b add the interface StoreFactory and refactor storeFactories 2018-11-27 11:35:02 +01:00
René Pfeuffer
00ab764dab Store repository id in native config file
Hooks can read this repository type dependant config file and handle
the changes for the correct repository id
2018-11-26 17:22:17 +01:00
René Pfeuffer
c8fc673ce0 Remove hooks for internal repository id 2018-11-23 16:12:35 +01:00
René Pfeuffer
0f7e49d20f Bring constant home 2018-11-23 15:52:21 +01:00
René Pfeuffer
3d671caada Let dao create repository base directory before native creation 2018-11-23 15:04:59 +01:00
René Pfeuffer
e8558e07ec Use repository dao to find repository for given directory in hooks 2018-11-23 10:13:47 +01:00
René Pfeuffer
20f5e7be1f Cleanup usage of InitialRepositoryLocationResolver and RepositoryLocationResolver 2018-11-22 17:06:29 +01:00
Mohamed Karray
f081cdda18 merge 2018-11-22 07:32:12 +01:00
Mohamed Karray
e772f75e2e remove the repository directory from the config ui components 2018-11-22 07:29:41 +01:00
Mohamed Karray
8aaea44f1a use relative path for repository directory 2018-11-22 07:05:17 +01:00
René Pfeuffer
024bcfaf87 Merged in feature/ui-abstraction-repository-config (pull request #110)
Feature/ui abstraction repository config
2018-11-21 13:06:41 +00:00
Mohamed Karray
bb1c84ba24 modify metadata.xml only if needed
introduce a defaultRepositoryDirectory in the XmlRepositoryDatabase
Bugfix: modify repository with changed location
2018-11-21 12:01:13 +01:00
Mohamed Karray
39e5c19251 merge 2018-11-15 11:28:33 +01:00
Mohamed Karray
f8ae7cedf7 Refactor the repository store implementation in order to store repositories in specific paths. 2018-11-15 10:04:16 +01:00
Maren Süwer
5bb4f04667 renaming GlobalConfiguration to Configuration 2018-11-13 13:09:02 +01:00
René Pfeuffer
716b49a039 Merge with 2.0.0-m3 2018-11-13 10:36:31 +01:00
Sebastian Sdorra
1002db3a4b disable default ui linking for plugins, enable it only for core plugins 2018-11-10 14:19:04 +01:00
René Pfeuffer
96c2114e53 Reduce SecurityFilter to user injection and enable SecurityInterceptor
Remove all the unnecessary stuff and all endpoints that would be no
longer secure.
2018-11-09 16:06:31 +01:00
René Pfeuffer
232e4fc072 Delete wrong throws JavaDoc declarations 2018-11-08 17:01:57 +01:00
René Pfeuffer
78da8c743f Put repository in git context to create proper exceptions 2018-11-08 16:42:45 +01:00
Sebastian Sdorra
cf519a7545 Merged in feature/merge_api (pull request #106)
Feature merge api
2018-11-08 15:08:07 +00:00
René Pfeuffer
6bddf9951f Make commit message configurable 2018-11-08 14:59:00 +01:00
René Pfeuffer
97d158ab35 Naming 2018-11-08 14:39:30 +01:00
René Pfeuffer
8d057f7745 Hide details 2018-11-08 14:37:18 +01:00
René Pfeuffer
42f0632a23 Add check for merged file to unit test 2018-11-08 14:03:09 +01:00
René Pfeuffer
720862296e Use logged in user for author as default 2018-11-08 13:30:05 +01:00
Sebastian Sdorra
2201f2436e Merged in feature/errorhandling (pull request #99)
Feature Error Handling
2018-11-08 09:36:18 +00:00
René Pfeuffer
6f7aa24700 Use jav nio to create temp directory 2018-11-08 10:00:21 +01:00
René Pfeuffer
5ca8d4d049 Extract methods to emphasize flow 2018-11-08 09:53:35 +01:00
René Pfeuffer
0714d5f960 Extract methods to emphasize flow 2018-11-08 09:32:43 +01:00
René Pfeuffer
1037d8d266 Merge with 2.0.0-m3 2018-11-08 09:21:41 +01:00
Sebastian Sdorra
c59ba9e149 Merged in feature/log_two_revisions (pull request #104)
Feature log two revisions
2018-11-07 14:07:50 +00:00
Sebastian Sdorra
73c402890c Merged in feature/diff_two_revisions (pull request #101)
Feature diff between two revisions
2018-11-07 13:54:23 +00:00
René Pfeuffer
2f91531d05 Assert existence of pool directory 2018-11-07 14:04:00 +01:00
René Pfeuffer
8771f68081 Set author for merge 2018-11-07 14:02:02 +01:00