[elvystrac] r1794 - soleni upgraded
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Fri, 19 Feb 2010 15:12:04 +0100
Author: DavidK
Date: 2010-02-19 15:12:04 +0100 (Fri, 19 Feb 2010)
New Revision: 1794
Added:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/debug/SaltBean.java
trunk/server/webServer2/WebContent/salt.xhtml
trunk/server/webServer2/WebContent/saltResult.xhtml
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserLoginBean.java
trunk/server/webServer2/WebContent/WEB-INF/faces-beans.xml
trunk/server/webServer2/WebContent/WEB-INF/faces-navigation.xml
trunk/server/webServer2/WebContent/login_body.xhtml
Log:
soleni upgraded
Added:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/debug/SaltBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/debug/SaltBean.java
(rev 0)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/debug/SaltBean.java
2010-02-19 14:12:04 UTC (rev 1794)
@@ -0,0 +1,48 @@
+package cz.elvys.webServer.beans.debug;
+
+import javax.faces.event.ActionEvent;
+
+import elvys.server.bl.Fact;
+import elvys.server.bl.user.UserBL;
+
+public class SaltBean {
+
+ private Integer notSalted;
+ private Integer saltedOnLastOperation;
+
+ private UserBL userBL;
+
+
+ {
+ userBL = Fact.getUserBL();
+ }
+
+ public Integer getNotSalted() {
+ notSalted = userBL.getNotSaltedPasswords();
+ return notSalted;
+ }
+ public void setNotSalted(Integer notSalted) {
+ this.notSalted = notSalted;
+ }
+ public Integer getSaltedOnLastOperation() {
+ return saltedOnLastOperation;
+ }
+ public void setSaltedOnLastOperation(Integer saltedOnLastOperation) {
+ this.saltedOnLastOperation = saltedOnLastOperation;
+ }
+
+
+
+
+
+ /**
+ * soli hesla v databazi - jenom ty, ktere jeste posolene nejsou
+ */
+ public String saltPasswords(){
+ saltedOnLastOperation = userBL.saltPasswordForAllUsers();
+ return "salted";
+ }
+
+
+
+}
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserLoginBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserLoginBean.java
2010-02-19 14:10:16 UTC (rev 1793)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/user/UserLoginBean.java
2010-02-19 14:12:04 UTC (rev 1794)
@@ -283,14 +283,4 @@
public void setCompany(Company company) {
this.company = company;
}
-
- /**
- * Musi co nejdrive pryc, jenom na soleni hesel!!
- * @TODO
- *
- */
- public String XXXsaltMethodXXX(){
- userBL.saltPasswordForAllUsers();
- return "logout";
- }
}
Modified: trunk/server/webServer2/WebContent/WEB-INF/faces-beans.xml
===================================================================
--- trunk/server/webServer2/WebContent/WEB-INF/faces-beans.xml 2010-02-19
14:10:16 UTC (rev 1793)
+++ trunk/server/webServer2/WebContent/WEB-INF/faces-beans.xml 2010-02-19
14:12:04 UTC (rev 1794)
@@ -128,4 +128,9 @@
<managed-bean-class>cz.elvys.webServer.beans.debug.DebugBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>saltBean</managed-bean-name>
+
<managed-bean-class>cz.elvys.webServer.beans.debug.SaltBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
</faces-config>
Modified: trunk/server/webServer2/WebContent/WEB-INF/faces-navigation.xml
===================================================================
--- trunk/server/webServer2/WebContent/WEB-INF/faces-navigation.xml
2010-02-19 14:10:16 UTC (rev 1793)
+++ trunk/server/webServer2/WebContent/WEB-INF/faces-navigation.xml
2010-02-19 14:12:04 UTC (rev 1794)
@@ -168,4 +168,12 @@
<to-view-id>/secured/companyrel/selectPermittedTypeForm.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+ <navigation-rule>
+ <from-view-id>/salt.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>salted</from-outcome>
+ <to-view-id>/saltResult.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
</faces-config>
Modified: trunk/server/webServer2/WebContent/login_body.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/login_body.xhtml 2010-02-19 14:10:16 UTC
(rev 1793)
+++ trunk/server/webServer2/WebContent/login_body.xhtml 2010-02-19 14:12:04 UTC
(rev 1794)
@@ -45,11 +45,6 @@
</h:panelGrid>
</h:form>
<h:outputText value="${lbl['login.createdby']}"
styleClass="loginFootnote" />
- <h:form>
- <h:commandButton value="OSOLIT HESLA! STISKNI POUZE JEDNOUT PRED
PRIHLASENIM!! POKUD DVAKRAT, PRESOLIS,POKUD VUBEC, CAJICKY NEPOUSTIME!!"
- immediate="true"
action="#{user.XXXsaltMethodXXX}"
- rendered="true" />
- </h:form>
</rich:panel>
</f:view>
Added: trunk/server/webServer2/WebContent/salt.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/salt.xhtml
(rev 0)
+++ trunk/server/webServer2/WebContent/salt.xhtml 2010-02-19 14:12:04 UTC
(rev 1794)
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";
+ xmlns:h="http://java.sun.com/jsf/html";
+ xmlns:f="http://java.sun.com/jsf/core";
+ xmlns:ui="http://java.sun.com/jsf/facelets";
+ xmlns:a4j="http://richfaces.org/a4j";
+ xmlns:rich="http://richfaces.org/rich";>
+
+
+<body>
+ <f:view>
+ <h:form>
+ <h:outputText value="pocet neosolenych: #{saltBean.notSalted}"
/>
+ <br/>
+ <h:commandButton value="OSOLIT HESLA! CAJICKY NEPOUSTIME!!"
+ immediate="true" action="#{saltBean.saltPasswords}"/>
+ </h:form>
+ </f:view>
+</body>
+
+</html>
+
+
+
Added: trunk/server/webServer2/WebContent/saltResult.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/saltResult.xhtml
(rev 0)
+++ trunk/server/webServer2/WebContent/saltResult.xhtml 2010-02-19 14:12:04 UTC
(rev 1794)
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";
+ xmlns:h="http://java.sun.com/jsf/html";
+ xmlns:f="http://java.sun.com/jsf/core";
+ xmlns:ui="http://java.sun.com/jsf/facelets";
+ xmlns:a4j="http://richfaces.org/a4j";
+ xmlns:rich="http://richfaces.org/rich";>
+
+
+<body>
+ <f:view>
+ <h:outputText value="Posoleno bylo:
#{saltBean.saltedOnLastOperation}" />
+ </f:view>
+</body>
+</html>
+
+
+
Other related posts:
- » [elvystrac] r1794 - soleni upgraded - elvys
