Commit 7c0dcfbb authored 6 years ago by Swen Vermeul

resolved conflicts

parents ac37372f 8f80afc5

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

authentication/source/java/ch/systemsx/cisd/authentication/BasicSession.java 1 addition, 1 deletion

...ce/java/ch/systemsx/cisd/authentication/BasicSession.java
authentication/source/java/ch/systemsx/cisd/authentication/DefaultSessionManager.java 5 additions, 5 deletions

...h/systemsx/cisd/authentication/DefaultSessionManager.java
authentication/source/java/ch/systemsx/cisd/authentication/DummyAuthenticationService.java 1 addition, 1 deletion

...temsx/cisd/authentication/DummyAuthenticationService.java
authentication/source/java/ch/systemsx/cisd/authentication/Principal.java 1 addition, 1 deletion

...ource/java/ch/systemsx/cisd/authentication/Principal.java
authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdAuthenticationService.java 3 additions, 3 deletions

...cisd/authentication/crowd/CrowdAuthenticationService.java
authentication/source/java/ch/systemsx/cisd/authentication/crowd/CrowdConfiguration.java 1 addition, 1 deletion

...ystemsx/cisd/authentication/crowd/CrowdConfiguration.java
authentication/source/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationConfiguration.java 1 addition, 1 deletion

...thentication/file/CachingAuthenticationConfiguration.java
authentication/source/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationService.java 1 addition, 1 deletion

...isd/authentication/file/CachingAuthenticationService.java
authentication/source/java/ch/systemsx/cisd/authentication/file/PasswordEditorCommand.java 1 addition, 1 deletion

...temsx/cisd/authentication/file/PasswordEditorCommand.java
authentication/source/java/ch/systemsx/cisd/authentication/file/UserCacheEntry.java 1 addition, 1 deletion

.../ch/systemsx/cisd/authentication/file/UserCacheEntry.java
authentication/source/java/ch/systemsx/cisd/authentication/file/UserEntry.java 1 addition, 1 deletion

.../java/ch/systemsx/cisd/authentication/file/UserEntry.java
authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPDirectoryConfiguration.java 1 addition, 1 deletion

.../cisd/authentication/ldap/LDAPDirectoryConfiguration.java
authentication/sourceTest/java/ch/systemsx/cisd/authentication/DefaultSessionManagerTest.java 1 addition, 1 deletion

...stemsx/cisd/authentication/DefaultSessionManagerTest.java
authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServiceInvalidLoginTests.java 1 addition, 1 deletion

...n/file/CachingAuthenticationServiceInvalidLoginTests.java
authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServicePasswordChangingTests.java 1 addition, 1 deletion

...le/CachingAuthenticationServicePasswordChangingTests.java
authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/CachingAuthenticationServiceSuccessTests.java 1 addition, 1 deletion

...cation/file/CachingAuthenticationServiceSuccessTests.java
authentication/sourceTest/java/ch/systemsx/cisd/authentication/file/FileBasedLineStoreTest.java 1 addition, 1 deletion

...emsx/cisd/authentication/file/FileBasedLineStoreTest.java
common/source/java/ch/systemsx/cisd/common/cli/ConsoleClientArguments.java 1 addition, 1 deletion

...a/ch/systemsx/cisd/common/cli/ConsoleClientArguments.java
common/source/java/ch/systemsx/cisd/common/db/Script.java 2 additions, 2 deletions

common/source/java/ch/systemsx/cisd/common/db/Script.java
common/source/java/ch/systemsx/cisd/common/db/mapper/SerializableObjectMapper.java 1 addition, 1 deletion

...temsx/cisd/common/db/mapper/SerializableObjectMapper.java

with 27 additions and 27 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment