Index: core-module/pom.xml
===================================================================
diff -u -r63fac83f16e5907e84a3827c9fad3886168d3c90 -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/pom.xml (.../pom.xml) (revision 63fac83f16e5907e84a3827c9fad3886168d3c90)
+++ core-module/pom.xml (.../pom.xml) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -7,7 +7,7 @@
313devgrp
jstree-project
- 19.07.20
+ 19.07.30
../pom.xml
@@ -31,7 +31,7 @@
313devgrp
lib-module
- 19.07.20
+ 19.07.30
pom
Index: core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/controller/JsTreeHibernateController.java
===================================================================
diff -u -r63fac83f16e5907e84a3827c9fad3886168d3c90 -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/controller/JsTreeHibernateController.java (.../JsTreeHibernateController.java) (revision 63fac83f16e5907e84a3827c9fad3886168d3c90)
+++ core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/controller/JsTreeHibernateController.java (.../JsTreeHibernateController.java) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -14,6 +14,7 @@
import com.google.common.collect.Maps;
import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService;
import egovframework.com.ext.jstree.springHibernate.core.util.Util_TitleChecker;
+import egovframework.com.ext.jstree.springHibernate.core.validation.group.*;
import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateDTO;
import egovframework.com.ext.jstree.support.mvc.GenericAbstractController;
import egovframework.com.ext.jstree.support.util.ParameterParser;
@@ -24,6 +25,7 @@
import org.springframework.ui.ModelMap;
import org.springframework.util.StringUtils;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -100,7 +102,7 @@
@ResponseBody
@RequestMapping(value = "/addNode.do", method = RequestMethod.POST)
- public ModelAndView addNode(JsTreeHibernateDTO jsTreeHibernateDTO,
+ public ModelAndView addNode(@Validated(value = AddNode.class) JsTreeHibernateDTO jsTreeHibernateDTO,
BindingResult bindingResult, ModelMap model) throws Exception {
if (bindingResult.hasErrors())
throw new RuntimeException();
@@ -114,7 +116,7 @@
@ResponseBody
@RequestMapping(value = "/removeNode.do", method = RequestMethod.POST)
- public ModelAndView removeNode(JsTreeHibernateDTO jsTreeHibernateDTO,
+ public ModelAndView removeNode(@Validated(value = RemoveNode.class) JsTreeHibernateDTO jsTreeHibernateDTO,
BindingResult bindingResult, ModelMap model) throws Exception {
if (bindingResult.hasErrors())
throw new RuntimeException();
@@ -139,7 +141,7 @@
@ResponseBody
@RequestMapping(value = "/alterNode.do")
- public ModelAndView alterNode(JsTreeHibernateDTO jsTreeHibernateDTO,
+ public ModelAndView alterNode(@Validated(value = AlterNode.class) JsTreeHibernateDTO jsTreeHibernateDTO,
BindingResult bindingResult, ModelMap model) throws Exception {
if (bindingResult.hasErrors()) {
throw new RuntimeException();
@@ -157,7 +159,7 @@
@ResponseBody
@RequestMapping(value = "/alterNodeType.do", method = RequestMethod.POST)
- public ModelAndView alterNodeType(JsTreeHibernateDTO jsTreeHibernateDTO,
+ public ModelAndView alterNodeType(@Validated(value = AlterNodeType.class) JsTreeHibernateDTO jsTreeHibernateDTO,
BindingResult bindingResult, ModelMap model) throws Exception {
if (bindingResult.hasErrors()) {
throw new RuntimeException();
@@ -172,7 +174,7 @@
@ResponseBody
@RequestMapping(value = "/moveNode.do", method = RequestMethod.POST)
- public ModelAndView moveNode(JsTreeHibernateDTO jsTreeHibernateDTO,
+ public ModelAndView moveNode(@Validated(value = MoveNode.class) JsTreeHibernateDTO jsTreeHibernateDTO,
BindingResult bindingResult, ModelMap model, HttpServletRequest request) throws Exception {
if (bindingResult.hasErrors())
throw new RuntimeException();
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/validation/custom/constraints/Contained.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/validation/custom/validator/ContainedValidator.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/validation/group/AddNode.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/validation/group/AlterNode.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/validation/group/AlterNodeType.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/validation/group/GetChildNode.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/validation/group/MoveNode.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/validation/group/RemoveNode.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/validation/group/SearchNode.java'.
FishEye: No comparison available. Pass `N' to diff?
Index: core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/controller/CoreController.java
===================================================================
diff -u -r63fac83f16e5907e84a3827c9fad3886168d3c90 -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/controller/CoreController.java (.../CoreController.java) (revision 63fac83f16e5907e84a3827c9fad3886168d3c90)
+++ core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/controller/CoreController.java (.../CoreController.java) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -3,6 +3,7 @@
import com.google.common.collect.Maps;
import egovframework.com.ext.jstree.springiBatis.core.service.CoreService;
import egovframework.com.ext.jstree.springiBatis.core.util.Util_TitleChecker;
+import egovframework.com.ext.jstree.springiBatis.core.validation.group.*;
import egovframework.com.ext.jstree.springiBatis.core.vo.ComprehensiveTree;
import egovframework.com.ext.jstree.springiBatis.core.vo.PaginatedComprehensiveTree;
import egovframework.com.ext.jstree.support.mvc.GenericAbstractController;
@@ -11,6 +12,7 @@
import org.springframework.ui.ModelMap;
import org.springframework.util.StringUtils;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -84,7 +86,7 @@
@ResponseBody
@RequestMapping(value="/addNode.do",method=RequestMethod.POST)
- public ModelAndView addNode(ComprehensiveTree comprehensiveTree,
+ public ModelAndView addNode(@Validated(value = AddNode.class) ComprehensiveTree comprehensiveTree,
BindingResult bindingResult, ModelMap model) throws Exception {
if (bindingResult.hasErrors())
throw new RuntimeException();
@@ -98,7 +100,7 @@
@ResponseBody
@RequestMapping(value="/removeNode.do",method=RequestMethod.POST)
- public ModelAndView removeNode(ComprehensiveTree comprehensiveTree,
+ public ModelAndView removeNode(@Validated(value = RemoveNode.class) ComprehensiveTree comprehensiveTree,
BindingResult bindingResult, ModelMap model) throws Exception {
if (bindingResult.hasErrors())
throw new RuntimeException();
@@ -112,7 +114,7 @@
@ResponseBody
@RequestMapping(value="/alterNode.do",method=RequestMethod.POST)
- public ModelAndView alterNode(ComprehensiveTree comprehensiveTree,
+ public ModelAndView alterNode(@Validated(value = AlterNode.class) ComprehensiveTree comprehensiveTree,
BindingResult bindingResult, ModelMap model) throws Exception {
if (bindingResult.hasErrors())
throw new RuntimeException();
@@ -128,7 +130,7 @@
@ResponseBody
@RequestMapping(value="/alterNodeType.do",method=RequestMethod.POST)
- public ModelAndView alterNodeType(ComprehensiveTree comprehensiveTree,
+ public ModelAndView alterNodeType(@Validated(value = AlterNodeType.class) ComprehensiveTree comprehensiveTree,
BindingResult bindingResult, ModelMap model) throws Exception {
if (bindingResult.hasErrors())
throw new RuntimeException();
@@ -142,7 +144,7 @@
@ResponseBody
@RequestMapping(value="/moveNode.do",method=RequestMethod.POST)
- public ModelAndView moveNode(ComprehensiveTree comprehensiveTree,
+ public ModelAndView moveNode(@Validated(value = MoveNode.class) ComprehensiveTree comprehensiveTree,
BindingResult bindingResult, ModelMap model, HttpServletRequest request) throws Exception {
if (bindingResult.hasErrors())
throw new RuntimeException();
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/validation/custom/constraints/Contained.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/validation/custom/validator/ContainedValidator.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/validation/group/AddNode.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/validation/group/AlterNode.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/validation/group/AlterNodeType.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/validation/group/GetChildNode.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/validation/group/MoveNode.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/validation/group/RemoveNode.java'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 63fac83f16e5907e84a3827c9fad3886168d3c90 refers to a dead (removed) revision in file `core-module/src/main/java/egovframework/com/ext/jstree/springiBatis/core/validation/group/SearchNode.java'.
FishEye: No comparison available. Pass `N' to diff?
Index: core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/dao/I_DB_GetChildNode.java
===================================================================
diff -u -r3378aeef18251570015a9efbed6402f39cffd95d -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/dao/I_DB_GetChildNode.java (.../I_DB_GetChildNode.java) (revision 3378aeef18251570015a9efbed6402f39cffd95d)
+++ core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/dao/I_DB_GetChildNode.java (.../I_DB_GetChildNode.java) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -8,7 +8,7 @@
public interface I_DB_GetChildNode extends
I_GenericDao {
- public List getChildNode( P_ComprehensiveTree p_ComprehensiveTree, String determineDBSetting);
- public List getChildNodeByLeftRight( P_ComprehensiveTree p_ComprehensiveTree, String determineDBSetting);
+ public List getChildNode(P_ComprehensiveTree p_ComprehensiveTree, String determineDBSetting);
+ public List getChildNodeByLeftRight(P_ComprehensiveTree p_ComprehensiveTree, String determineDBSetting);
}
Index: core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/dao/I_DB_GetNode.java
===================================================================
diff -u -r3378aeef18251570015a9efbed6402f39cffd95d -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/dao/I_DB_GetNode.java (.../I_DB_GetNode.java) (revision 3378aeef18251570015a9efbed6402f39cffd95d)
+++ core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/dao/I_DB_GetNode.java (.../I_DB_GetNode.java) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -8,6 +8,6 @@
public T_ComprehensiveTree getNode(P_ComprehensiveTree p_ComprehensiveTree, String determineDBSetting);
- public T_ComprehensiveTree getNodeByRef( P_ComprehensiveTree p_ComprehensiveTree, String determineDBSetting);
+ public T_ComprehensiveTree getNodeByRef(P_ComprehensiveTree p_ComprehensiveTree, String determineDBSetting);
}
Index: core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/dao/I_DB_SearchNode.java
===================================================================
diff -u -r3378aeef18251570015a9efbed6402f39cffd95d -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/dao/I_DB_SearchNode.java (.../I_DB_SearchNode.java) (revision 3378aeef18251570015a9efbed6402f39cffd95d)
+++ core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/dao/I_DB_SearchNode.java (.../I_DB_SearchNode.java) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -8,8 +8,8 @@
public interface I_DB_SearchNode extends
I_GenericDao {
- public List searchNodeByString( P_ComprehensiveTree p_ComprehensiveTree, String determineDBSetting);
+ public List searchNodeByString(P_ComprehensiveTree p_ComprehensiveTree, String determineDBSetting);
- public List searchNodeByPosition( List p_SearchNodeByPositions, String determineDBSetting);
+ public List searchNodeByPosition(List p_SearchNodeByPositions, String determineDBSetting);
}
Index: core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/service/I_S_GetChildNode.java
===================================================================
diff -u -r3378aeef18251570015a9efbed6402f39cffd95d -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/service/I_S_GetChildNode.java (.../I_S_GetChildNode.java) (revision 3378aeef18251570015a9efbed6402f39cffd95d)
+++ core-module/src/main/java/egovframework/com/ext/jstree/strutsiBatis/core/service/I_S_GetChildNode.java (.../I_S_GetChildNode.java) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -13,8 +13,8 @@
public void setRequest(HttpServletRequest request);
- public List getChildNode( P_ComprehensiveTree p_ComprehensiveTree);
+ public List getChildNode(P_ComprehensiveTree p_ComprehensiveTree);
- public List getChildNodeByLeftRight( P_ComprehensiveTree p_ComprehensiveTree);
+ public List getChildNodeByLeftRight(P_ComprehensiveTree p_ComprehensiveTree);
}
Index: core-module/src/main/java/egovframework/com/ext/jstree/support/security/controller/RegistrationController.java
===================================================================
diff -u -rd7088cf9a124e0e4e47d544aeae935787cadf325 -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/src/main/java/egovframework/com/ext/jstree/support/security/controller/RegistrationController.java (.../RegistrationController.java) (revision d7088cf9a124e0e4e47d544aeae935787cadf325)
+++ core-module/src/main/java/egovframework/com/ext/jstree/support/security/controller/RegistrationController.java (.../RegistrationController.java) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -1,18 +1,34 @@
package egovframework.com.ext.jstree.support.security.controller;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
import egovframework.com.ext.jstree.support.security.dto.LocalUser;
import egovframework.com.ext.jstree.support.security.dto.UserRegistrationForm;
import egovframework.com.ext.jstree.support.security.exception.UserAlreadyExistAuthenticationException;
import egovframework.com.ext.jstree.support.security.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
@RestController
public class RegistrationController {
@Autowired
private UserService userService;
+ @RequestMapping(value = "/signup", method = RequestMethod.GET)
+ public ModelAndView signup(HttpServletRequest request, HttpServletResponse response) throws ServletException,IOException {
+ ModelAndView model = new ModelAndView();
+ model.addObject("title", "User Registration Form");
+ model.setViewName("egovframework/com/ext/jstree/support/security/registration");
+ return model;
+ }
+
@RequestMapping(value = {"/user/register"}, method = RequestMethod.POST, consumes = "application/json", produces = "application/json")
public @ResponseBody String registerUser(@RequestBody UserRegistrationForm registrationForm) throws UserAlreadyExistAuthenticationException {
Index: core-module/src/main/java/egovframework/com/ext/jstree/support/security/database/model/User.java
===================================================================
diff -u -r3378aeef18251570015a9efbed6402f39cffd95d -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/src/main/java/egovframework/com/ext/jstree/support/security/database/model/User.java (.../User.java) (revision 3378aeef18251570015a9efbed6402f39cffd95d)
+++ core-module/src/main/java/egovframework/com/ext/jstree/support/security/database/model/User.java (.../User.java) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -41,12 +41,12 @@
joinColumns = @JoinColumn(name = "USER_ID"),
inverseJoinColumns = @JoinColumn(name = "ROLE_ID")
)
- private Set roles = new HashSet<>();
+ private Set roles = new HashSet<>();
public User() {
}
- public User(final String userId, final String name, final String password, final String emailId, final Integer active, final String provider, final Set roles) {
+ public User(final String userId, final String name, final String password, final String emailId, final Integer active, final String provider, final Set roles) {
this.userId = userId;
this.name = name;
this.password = password;
@@ -88,11 +88,11 @@
this.active = active;
}
- public Set getRoles() {
+ public Set getRoles() {
return roles;
}
- public void setRoles(final Set roles) {
+ public void setRoles(final Set roles) {
this.roles = roles;
}
Index: core-module/src/main/java/egovframework/com/ext/jstree/support/security/dto/UserRegistrationForm.java
===================================================================
diff -u -r3378aeef18251570015a9efbed6402f39cffd95d -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/src/main/java/egovframework/com/ext/jstree/support/security/dto/UserRegistrationForm.java (.../UserRegistrationForm.java) (revision 3378aeef18251570015a9efbed6402f39cffd95d)
+++ core-module/src/main/java/egovframework/com/ext/jstree/support/security/dto/UserRegistrationForm.java (.../UserRegistrationForm.java) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -8,12 +8,12 @@
private String phoneno;
private String email;
private String password;
- private egovframework.com.ext.jstree.support.security.dto.SocialProvider socialProvider;
+ private SocialProvider socialProvider;
public UserRegistrationForm() {
}
- public UserRegistrationForm(final String userId, final String firstName, final String lastName, final String phoneno, final String email, final String password, final egovframework.com.ext.jstree.support.security.dto.SocialProvider socialProvider) {
+ public UserRegistrationForm(final String userId, final String firstName, final String lastName, final String phoneno, final String email, final String password, final SocialProvider socialProvider) {
this.userId = userId;
this.firstName = firstName;
this.lastName = lastName;
@@ -75,11 +75,11 @@
this.phoneno = phoneno;
}
- public egovframework.com.ext.jstree.support.security.dto.SocialProvider getSocialProvider() {
+ public SocialProvider getSocialProvider() {
return socialProvider;
}
- public void setSocialProvider(final egovframework.com.ext.jstree.support.security.dto.SocialProvider socialProvider) {
+ public void setSocialProvider(final SocialProvider socialProvider) {
this.socialProvider = socialProvider;
}
@@ -90,7 +90,7 @@
private String phoneno;
private String email;
private String password;
- private egovframework.com.ext.jstree.support.security.dto.SocialProvider socialProvider;
+ private SocialProvider socialProvider;
public Builder addUserId(final String userId) {
this.userId = userId;
@@ -122,7 +122,7 @@
return this;
}
- public Builder addSocialProvider(final egovframework.com.ext.jstree.support.security.dto.SocialProvider socialProvider) {
+ public Builder addSocialProvider(final SocialProvider socialProvider) {
this.socialProvider = socialProvider;
return this;
}
Index: core-module/src/main/java/egovframework/com/ext/jstree/support/security/service/RegistrationUserDetailService.java
===================================================================
diff -u -rbdbc57c5de20d7e93e739a2e8079ed649626cbd2 -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- core-module/src/main/java/egovframework/com/ext/jstree/support/security/service/RegistrationUserDetailService.java (.../RegistrationUserDetailService.java) (revision bdbc57c5de20d7e93e739a2e8079ed649626cbd2)
+++ core-module/src/main/java/egovframework/com/ext/jstree/support/security/service/RegistrationUserDetailService.java (.../RegistrationUserDetailService.java) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -16,7 +16,7 @@
import java.util.HashSet;
@Service("registrationUserDetailService")
-public class RegistrationUserDetailService implements egovframework.com.ext.jstree.support.security.service.UserService {
+public class RegistrationUserDetailService implements UserService {
@Autowired
@Qualifier(value = "localUserDetailService")
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/message/com/bbs/message_en.properties'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/message/com/bbs/message_ko.properties'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/spring/com/context-validator.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com-rules.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/adb/EgovAdressBook.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/bbs/EgovBdMstrRegist.xml.org'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/bbs/EgovCommentRegist.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/bbs/EgovNoticeRegist.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/bbs/EgovSatisfactionRegist.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/bbs/EgovScrapRegist.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/clb/EgovClubRegist.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/cmy/EgovCmmntyRegist.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/com/EgovCopComManage.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/ems/EgovMailRegist.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/ncm/EgovNcrdRegist.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/sms/EgovSmsInfoRegist.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/smt/djm/EgovDeptJob.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/smt/djm/EgovDeptJobBx.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/smt/dsm/EgovDiaryManage.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/smt/lsm/EgovLeaderSchdul.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/smt/lsm/EgovLeaderSttus.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/smt/mrm/EgovMemoReprt.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/smt/mtm/EgovMemoTodo.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/smt/sdm/EgovDeptSchdulManage.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/smt/sim/EgovIndvdlSchdulManage.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/com/cop/smt/wmr/EgovWikMnthngReprt.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag a7656dea889b0658185b6b89d61f213a68ac8ead refers to a dead (removed) revision in file `core-module/src/main/resources/egovframework/validator/validator-rules.xml'.
FishEye: No comparison available. Pass `N' to diff?
Index: lib-module/pom.xml
===================================================================
diff -u -r63fac83f16e5907e84a3827c9fad3886168d3c90 -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- lib-module/pom.xml (.../pom.xml) (revision 63fac83f16e5907e84a3827c9fad3886168d3c90)
+++ lib-module/pom.xml (.../pom.xml) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -5,7 +5,7 @@
313devgrp
jstree-project
- 19.07.20
+ 19.07.30
../pom.xml
Index: pom.xml
===================================================================
diff -u -r63fac83f16e5907e84a3827c9fad3886168d3c90 -rcd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b
--- pom.xml (.../pom.xml) (revision 63fac83f16e5907e84a3827c9fad3886168d3c90)
+++ pom.xml (.../pom.xml) (revision cd4d1fc7ef434e1b6acbea8d6556ff6d2fd7e63b)
@@ -10,7 +10,7 @@
4.0.0
313devgrp
jstree-project
- 19.07.20
+ 19.07.30
pom
jstree-project