Mergejuttuja

code/Autentikaation asennus glassfishiin.

@@ -2,7 +2,7 @@ bortal realmin lisääminen glassfishiin.
 
 
 1. Lisää code/LanBortalAuthModule.jar tiedosto hakemistoon glassfish/glassfish/lib/
 1. Lisää code/LanBortalAuthModule.jar tiedosto hakemistoon glassfish/glassfish/lib/
  
  
-2. lisää tiedostoon glassfish/glassfish/domains/login.conf tiedostoon:
+2. lisää tiedostoon glassfish/glassfish/domains/domain1/config/login.conf tiedostoon:
 
 
 bortalRealm {
 bortalRealm {
        fi.insomnia.bortal.BortalLoginModule required;
        fi.insomnia.bortal.BortalLoginModule required;

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java

@@ -36,12 +36,10 @@ public class UserBean implements UserBeanLocal {
     }
     }
 
 
     @Override
     @Override
-    public User createNewUser(String nick, String password) {
+    public User createNewUser(String login, String password) {
         User returnUser = new User();
         User returnUser = new User();
-        returnUser.setNick(nick);
-
-        String salted = PasswordFunctions.createPassword(password);
-        returnUser.setPassword(salted);
+        returnUser.setLogin(login);
+        returnUser.resetPassword(password);
         // Tallennetaan olio kantaan...
         // Tallennetaan olio kantaan...
         userFacade.create(returnUser);
         userFacade.create(returnUser);
         return returnUser;
         return returnUser;

code/LanBortalWeb/WebContent/user/create.xhtml

@@ -17,7 +17,7 @@
 		
 		
 		<h:form>
 		<h:form>
 		<h:panelGrid columns="2">
 		<h:panelGrid columns="2">
-			<h:outputLabel value="Nick:" /><h:inputText value="#{userView.nick}" />
+			<h:outputLabel value="Login name:" /><h:inputText value="#{userView.login}" />
 			<h:outputLabel value="Password:" /><h:inputSecret value="#{userView.password}" />
 			<h:outputLabel value="Password:" /><h:inputSecret value="#{userView.password}" />
 			<h:commandButton action="#{userView.createUser()}" value="Create" />
 			<h:commandButton action="#{userView.createUser()}" value="Create" />
 		</h:panelGrid>
 		</h:panelGrid>

code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java

@@ -36,7 +36,7 @@ public class UserView {
     private static final Logger logger = LoggerFactory.getLogger(UserView.class);
     private static final Logger logger = LoggerFactory.getLogger(UserView.class);
     private User user;
     private User user;
     private ListDataModel<User> items;
     private ListDataModel<User> items;
-    private String nick;
+    private String login;
     private String password;
     private String password;
     @EJB
     @EJB
     private SecurityBeanLocal securitybean;
     private SecurityBeanLocal securitybean;
@@ -57,11 +57,11 @@ public class UserView {
         }
         }
 
 
         logger.info("Saving user");
         logger.info("Saving user");
-        // Luodaan uusi kÔøΩyttÔøΩjÔøΩ UserBeanin funktiolla createNewUser jolle
-        // annetaan parametrina pakolliset tiedot ( nick ja salasana )
-        // Paluuarvona saadaan uusi uljas k�ytt�j�-olio.
-        setUser(userBean.createNewUser(nick, password));
-        nick = "";
+        // Luodaan uusi käyttäjä UserBeanin funktiolla createNewUser jolle
+        // annetaan parametrina pakolliset tiedot ( login ja salasana )
+        // Paluuarvona saadaan uusi uljas käyttäjä-olio.
+        setUser(userBean.createNewUser(login, password));
+        login = "";
         password = "";
         password = "";
         if (getUser() == null) {
         if (getUser() == null) {
             logger.warn("Could not create user. function returned null!");
             logger.warn("Could not create user. function returned null!");
@@ -77,7 +77,6 @@ public class UserView {
     }
     }
 
 
     public ListDataModel<User> getUsers() {
     public ListDataModel<User> getUsers() {
-        sessionbean.testing();
         List<User> users = userBean.getUsers();
         List<User> users = userBean.getUsers();
         items = new ListDataModel<User>(users);
         items = new ListDataModel<User>(users);
         logger.info("Fetching users. Found {}", items.getRowCount());
         logger.info("Fetching users. Found {}", items.getRowCount());
@@ -87,12 +86,12 @@ public class UserView {
     }
     }
 
 
     // Getters and setters...
     // Getters and setters...
-    public String getNick() {
-        return nick;
+    public String getLogin() {
+        return login;
     }
     }
 
 
-    public void setNick(String nick) {
-        this.nick = nick;
+    public void setLogin(String login) {
+        this.login = login;
     }
     }
 
 
     public String getPassword() {
     public String getPassword() {
@@ -118,6 +117,4 @@ public class UserView {
     public SessionHandler getSessionhandler() {
     public SessionHandler getSessionhandler() {
         return sessionhandler;
         return sessionhandler;
     }
     }
-
-    
 }
 }