You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mp...@apache.org on 2011/07/05 23:51:45 UTC
svn commit: r1143208 - in /incubator/rave/trunk/rave-portal/src/main:
java/org/apache/rave/portal/repository/impl/
java/org/apache/rave/portal/service/impl/
java/org/apache/rave/portal/web/controller/ webapp/ webapp/css/
Author: mpierce
Date: Tue Jul 5 21:51:44 2011
New Revision: 1143208
URL: http://svn.apache.org/viewvc?rev=1143208&view=rev
Log:
(RAVE-89) Some cleanup of the account registration code to use Rave best practices.
Modified:
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css
incubator/rave/trunk/rave-portal/src/main/webapp/newaccount.jsp
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java?rev=1143208&r1=1143207&r2=1143208&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java Tue Jul 5 21:51:44 2011
@@ -53,9 +53,7 @@ public class JpaUserRepository implement
}
@Override
- @Transactional
public User save(User user) {
return saveOrUpdate(user.getUserId(),manager,user);
- // throw new NotImplementedException("Save is not implemented for this repository");
}
}
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1143208&r1=1143207&r2=1143208&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java Tue Jul 5 21:51:44 2011
@@ -109,6 +109,7 @@ public class DefaultUserService implemen
}
@Override
+ @Transactional
public void registerNewUser(User user) {
userRepository.save(user);
}
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java?rev=1143208&r1=1143207&r2=1143208&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java Tue Jul 5 21:51:44 2011
@@ -31,8 +31,6 @@ import org.springframework.web.bind.anno
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-//probably should be deleted
-import java.util.Random;
@Controller
@RequestMapping(value = { "/newaccount/*", "/newaccount" })
@@ -42,26 +40,21 @@ public class NewAccountController {
@Autowired
public NewAccountController(UserService userService) {
- System.out.println("New Account Controller constructed");
this.userService = userService;
}
- @RequestMapping(method = RequestMethod.GET)
+ @RequestMapping(method = RequestMethod.POST)
//Needs to be specified by action.
- public String create(Model model, @RequestParam String userName, @RequestParam String password) {
- // Must be implemented
+ public String create(Model model, @RequestParam String userName, @RequestParam String password) {
+ User user=new User();
+ user.setUsername(userName);
+ user.setPassword(password);
+ user.setExpired(false);
+ user.setLocked(false);
+ user.setEnabled(true);
+ userService.registerNewUser(user);
- System.out.println("===============Creating New Account================");
- System.out.println("Username and password:"+userName+" "+password);
- User user=new User();
- user.setUsername(userName);
- user.setPassword(password);
- user.setExpired(false);
- user.setLocked(false);
- user.setEnabled(true);
- userService.registerNewUser(user);
-
- return "redirect:login.jsp";
+ return "redirect:/";
}
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css?rev=1143208&r1=1143207&r2=1143208&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css Tue Jul 5 21:51:44 2011
@@ -278,4 +278,10 @@ p label {
input.long {
width:400px;
+}
+
+/* Associated with JQuery validation CSS */
+.error {
+ font: normal 10px arial;
+ color: #ff0000
}
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/newaccount.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/newaccount.jsp?rev=1143208&r1=1143207&r2=1143208&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/newaccount.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/newaccount.jsp Tue Jul 5 21:51:44 2011
@@ -17,46 +17,47 @@
specific language governing permissions and limitations
under the License.
--%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>
-<rave:rave_generic_page pageTitle="New Account Application - Rave">
- <script src="http://code.jquery.com/jquery-latest.js"></script>
- <script src="http://view.jquery.com/trunk/plugins/validate/jquery.validate.js"></script>
- <script>
- $(document).ready(function(){
- $("#newAccountForm").validate();
- });
- </script>
- <style>
- .error {
- font: normal 10px arial;
- color: #ff0000
- }
- </style>
- <div id="content">
- <h1>Rave Test Account Application</h1>
- <form id="newAccountForm" name="newAccountForm" action="app/newaccount">
- <fieldset>
- <p>
- <label for="userNameField">Username:</label> <input
- id="userNameField" type="text" name="userName" class="required" minlength="4"/>
- </p>
- <p>
- <label for="passwordField">Password:</label> <input
- id="passwordField" type="password" name="password" class="required" minlength="4"/>
- </p>
- <p>
- <label for="passwordConfirmField">Confirm Password:</label> <input
- id="passwordConfirmField" type="password" name="passwordConfirmed" class="required" minlength="4" equalTo="#passwordField"/>
- </p>
- <p>
+ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+ <%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>
+
+ <rave:rave_generic_page pageTitle="New Account Application - Rave">
+ <div id="content">
+ <h1>Rave Account Application</h1>
+ <form id="newAccountForm" name="newAccountForm" action="app/newaccount" method="POST">
+ <fieldset>
+ <p>
+ <label for="userNameField">Username:</label> <input
+ id="userNameField" type="text" name="userName" class="required" minlength="4"/>
+ </p>
+ <p>
+ <label for="passwordField">Password:</label> <input
+ id="passwordField" type="password" name="password" class="required" minlength="4"/>
+ </p>
+ <p>
+ <label for="passwordConfirmField">Confirm Password:</label> <input
+ id="passwordConfirmField" type="password" name="passwordConfirmed" class="required" minlength="4" equalTo="#passwordField"/>
+ </p>
+ <p>
<input type="submit" value="Create Account" />
- </p>
-
- </fieldset>
-
+ </p>
+
+ </fieldset>
</form>
- </div>
-
-</rave:rave_generic_page>
+ </div>
+ <script src="//code.jquery.com/jquery-latest.js"></script>
+ <!--
+ We may want to include this function in the release as a local src. The JQuery
+ documentation uses an obsolete link that redirects to the link below. Chrome 12, for
+ one, was unable to follow the redirection, breaking the validation. Unfortunately, it
+ is also MIT/GPL dual-licensed.
+ -->
+ <script src="//view.jquery.com/trunk/plugins/validate/jquery.validate.js"></script>
+ <script>
+ $(document).ready(function(){
+ $("#newAccountForm").validate();
+ });
+ </script>
+
+ </rave:rave_generic_page>
+
\ No newline at end of file