stuff

code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/BootstrapBeanLocal.java

@@ -23,5 +23,6 @@ import javax.ejb.Local;
 @Local
 @Local
 public interface BootstrapBeanLocal {
 public interface BootstrapBeanLocal {
 
 
-	void saneDefaults();
+	// no empty databases
+//	void saneDefaults();
 }
 }

code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java

@@ -298,16 +298,16 @@ public class BootstrapBean implements BootstrapBeanLocal {
 			dbModelFacade.create(dBm);
 			dbModelFacade.create(dBm);
 		}
 		}
 	}
 	}
-
-	public void saneDefaults() {
-		User adminUser = userFacade.findByLogin("admin");
-		if (adminUser == null) {
-			adminUser = new User();
-			adminUser.setLogin("admin");
-			// adminUser.setSuperadmin(true);
-			adminUser.resetPassword("admin");
-			userFacade.create(adminUser);
-		}
-	}
+// We will never run this again with empty database
+//	public void saneDefaults() {
+//		User adminUser = userFacade.findByLogin("admin");
+//		if (adminUser == null) {
+//			adminUser = new User();
+//			adminUser.setLogin("admin");
+//			// adminUser.setSuperadmin(true);
+//			adminUser.resetPassword("admin");
+//			userFacade.create(adminUser);
+//		}
+//	}
 
 
 }
 }

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/AuthView.java

@@ -131,7 +131,7 @@ public class AuthView extends GenericCDIView {
 
 
 	private void doLogin(String onError) {
 	private void doLogin(String onError) {
 
 
-		bootStrapBean.saneDefaults();
+//		bootStrapBean.saneDefaults();
 
 
 		if (login == null || password == null || login.isEmpty() || password.isEmpty()) {
 		if (login == null || password == null || login.isEmpty() || password.isEmpty()) {
 			return;
 			return;
@@ -163,7 +163,9 @@ public class AuthView extends GenericCDIView {
 			} else {
 			} else {
 				navihandler.forward(onError);
 				navihandler.forward(onError);
 				try {
 				try {
-					request.login(User.ANONYMOUS_LOGINNAME, null);
+					request.logout();
+					request.getSession().invalidate();
+					navihandler.forward("/frontpage?faces-redirect=true");
 				} catch (ServletException e) {
 				} catch (ServletException e) {
 					logger.warn("Error while trying to relogin as anonymous", e);
 					logger.warn("Error while trying to relogin as anonymous", e);
 				}
 				}