/[Apache-SVN]
ViewVC logotype

Revision 1626150


Jump to revision: Previous Next
Author: ilgrosso
Date: Fri Sep 19 08:58:36 2014 UTC (9 years, 6 months ago)
Changed paths: 62
Log Message:
[SYNCOPE-135] Merge from 1_2_X

Changed paths

Path Details
Directorysyncope/trunk/ modified , props changed
Directorysyncope/trunk/common/src/main/java/org/apache/syncope/common/mod/UserMod.java modified , text changed
Directorysyncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java modified , text changed
Directorysyncope/trunk/common/src/main/java/org/apache/syncope/common/services/SecurityQuestionService.java
(Copied from syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/services/SecurityQuestionService.java, r1626149)
added
Directorysyncope/trunk/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java modified , text changed
Directorysyncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnPoolConfTO.java modified , text changed
Directorysyncope/trunk/common/src/main/java/org/apache/syncope/common/to/SecurityQuestionTO.java
(Copied from syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/to/SecurityQuestionTO.java, r1626149)
added
Directorysyncope/trunk/common/src/main/java/org/apache/syncope/common/to/UserTO.java modified , text changed
Directorysyncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java modified , text changed
Directorysyncope/trunk/common/src/main/java/org/apache/syncope/common/types/RESTHeaders.java modified , text changed
Directorysyncope/trunk/core/pom.xml modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationJob.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SecurityQuestion.java
(Copied from syncope/branches/1_2_X/core/src/main/java/org/apache/syncope/core/persistence/beans/SecurityQuestion.java, r1626149)
added
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/SecurityQuestionDAO.java
(Copied from syncope/branches/1_2_X/core/src/main/java/org/apache/syncope/core/persistence/dao/SecurityQuestionDAO.java, r1626149)
added
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/SecurityQuestionDAOImpl.java
(Copied from syncope/branches/1_2_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/SecurityQuestionDAOImpl.java, r1626149)
added
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SecurityQuestionController.java
(Copied from syncope/branches/1_2_X/core/src/main/java/org/apache/syncope/core/rest/controller/SecurityQuestionController.java, r1626149)
added
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/NotificationDataBinder.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SecurityQuestionDataBinder.java
(Copied from syncope/branches/1_2_X/core/src/main/java/org/apache/syncope/core/rest/data/SecurityQuestionDataBinder.java, r1626149)
added
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/services/NotificationServiceImpl.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/services/SchemaServiceImpl.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/services/SecurityQuestionServiceImpl.java
(Copied from syncope/branches/1_2_X/core/src/main/java/org/apache/syncope/core/services/SecurityQuestionServiceImpl.java, r1626149)
added
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserSelfServiceImpl.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/util/Encryptor.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/util/POJOHelper.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java modified , text changed
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Notify.java
(Copied from syncope/branches/1_2_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Notify.java, r1626149)
added
Directorysyncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/PasswordReset.java
(Copied from syncope/branches/1_2_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/PasswordReset.java, r1626149)
added
Directorysyncope/trunk/core/src/main/resources/META-INF/orm.xml modified , text changed
Directorysyncope/trunk/core/src/main/resources/META-INF/orm.xml.oracle modified , text changed
Directorysyncope/trunk/core/src/main/resources/META-INF/orm.xml.sqlserver modified , text changed
Directorysyncope/trunk/core/src/main/resources/content.xml modified , text changed
Directorysyncope/trunk/core/src/main/resources/mail.properties modified , text changed
Directorysyncope/trunk/core/src/main/resources/mailTemplates/confirmPasswordReset.html.vm
(Copied from syncope/branches/1_2_X/core/src/main/resources/mailTemplates/confirmPasswordReset.html.vm, r1626149)
added
Directorysyncope/trunk/core/src/main/resources/mailTemplates/confirmPasswordReset.txt.vm
(Copied from syncope/branches/1_2_X/core/src/main/resources/mailTemplates/confirmPasswordReset.txt.vm, r1626149)
added
Directorysyncope/trunk/core/src/main/resources/mailTemplates/requestPasswordReset.html.vm
(Copied from syncope/branches/1_2_X/core/src/main/resources/mailTemplates/requestPasswordReset.html.vm, r1626149)
added
Directorysyncope/trunk/core/src/main/resources/mailTemplates/requestPasswordReset.txt.vm
(Copied from syncope/branches/1_2_X/core/src/main/resources/mailTemplates/requestPasswordReset.txt.vm, r1626149)
added
Directorysyncope/trunk/core/src/main/resources/userWorkflow.bpmn20.xml modified , text changed
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/connid/PasswordGeneratorTest.java modified , text changed
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java modified , text changed
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/NotificationTest.java modified , text changed
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/SecurityQuestionTest.java
(Copied from syncope/branches/1_2_X/core/src/test/java/org/apache/syncope/core/persistence/dao/SecurityQuestionTest.java, r1626149)
added
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/UserTest.java modified , text changed
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/SecurityQuestionTest.java
(Copied from syncope/branches/1_2_X/core/src/test/java/org/apache/syncope/core/persistence/relationships/SecurityQuestionTest.java, r1626149)
added
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java modified , text changed
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java modified , text changed
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SecurityQuestionTestITCase.java
(Copied from syncope/branches/1_2_X/core/src/test/java/org/apache/syncope/core/rest/SecurityQuestionTestITCase.java, r1626149)
added
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserSelfTestITCase.java modified , text changed
Directorysyncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java modified , text changed
Directorysyncope/trunk/core/src/test/resources/content.xml modified , text changed
Directorysyncope/trunk/core/src/test/resources/mail.properties modified , text changed
Directorysyncope/trunk/core/src/test/resources/userWorkflow.bpmn20.xml modified , text changed
Directorysyncope/trunk/pom.xml modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26