[elvystrac] r1925 - (1)deleting of files upgraded
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Sat, 27 Feb 2010 20:17:58 +0100
Author: DavidK
Date: 2010-02-27 20:17:57 +0100 (Sat, 27 Feb 2010)
New Revision: 1925
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/companyrel/CompanyListBean.java
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/debug/SaltBean.java
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/filerel/FileListComponentBean.java
trunk/server/webServer2/JavaSource/cz/elvys/webServer/component/filerel/FileListComponentBean.java
trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
trunk/server/webServer2/WebContent/salt.xhtml
trunk/server/webServer2/WebContent/saltResult.xhtml
Log:
(1)deleting of files upgraded
(2)support for repairing file records in DB
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/companyrel/CompanyListBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/companyrel/CompanyListBean.java
2010-02-27 19:16:46 UTC (rev 1924)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/companyrel/CompanyListBean.java
2010-02-27 19:17:57 UTC (rev 1925)
@@ -1,29 +1,14 @@
package cz.elvys.webServer.beans.companyrel;
-import java.io.File;
-import java.io.IOException;
import java.io.Serializable;
import java.util.List;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import org.apache.log4j.Logger;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import cz.elvys.commons.def.PropertyManager;
import cz.elvys.commons.utils.CommonUtils;
import cz.elvys.webServer.HIBgen.Company;
-import cz.elvys.webServer.HIBgen.User;
-import cz.elvys.webServer.beans.categrel.CatDefEditBean;
-import cz.elvys.webServer.db.InitSessionFactory;
-import cz.elvys.webServer.utils.faces.MessageUtils;
import elvys.server.bl.Fact;
import elvys.server.bl.companyRel.CompanyBL;
@@ -74,7 +59,7 @@
*/
public String prepareListOfCompanies() {
try {
- companies = cbl.getListOfCompanies(null);
+ companies = cbl.listCompaniesMakeSession(null);
} catch (Exception e) {
String message = CommonUtils.prepareErrorMessage(
CANNOT_PREPARE_LIST);
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/debug/SaltBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/debug/SaltBean.java
2010-02-27 19:16:46 UTC (rev 1924)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/debug/SaltBean.java
2010-02-27 19:17:57 UTC (rev 1925)
@@ -1,20 +1,31 @@
package cz.elvys.webServer.beans.debug;
-import javax.faces.event.ActionEvent;
+import org.apache.log4j.Logger;
import elvys.server.bl.Fact;
+import elvys.server.bl.file.FileManagerBL;
import elvys.server.bl.user.UserBL;
+
public class SaltBean {
private Integer notSalted;
private Integer saltedOnLastOperation;
+ private Integer repairedFilesOnLastOp;
+ private String pass;
+ private static Logger log = null;
+
private UserBL userBL;
+ private FileManagerBL fileManagerBL;
+ static {
+ log= Logger.getLogger(SaltBean.class);
+ }
{
userBL = Fact.getUserBL();
+ fileManagerBL = Fact.getFileManagerBL();
}
public Integer getNotSalted() {
@@ -30,19 +41,37 @@
public void setSaltedOnLastOperation(Integer saltedOnLastOperation) {
this.saltedOnLastOperation = saltedOnLastOperation;
}
-
-
-
-
-
+ public Integer getRepairedFilesOnLastOp() {
+ return repairedFilesOnLastOp;
+ }
+ public void setRepairedFilesOnLastOp(Integer repairedFilesOnLastOp) {
+ this.repairedFilesOnLastOp = repairedFilesOnLastOp;
+ }
+ public String getPass() {
+ return pass;
+ }
+ public void setPass(String pass) {
+ this.pass = pass;
+ }
+
/**
* soli hesla v databazi - jenom ty, ktere jeste posolene nejsou
+ * taky to opravuje hashcody v DB (+ sizes)
*/
public String saltPasswords(){
- saltedOnLastOperation = userBL.saltPasswordForAllUsers();
- return "salted";
+ try {
+ if ("".equals(pass)) {
+ saltedOnLastOperation =
userBL.saltPasswordForAllUsers();
+ repairedFilesOnLastOp =
fileManagerBL.repairFileHashesAndSizes();
+ return "salted";
+ } else {
+ return "error";
+ }
+ } catch (Exception e) {
+ String message = "cannot salt..";
+ log.error(message,e);
+ throw new RuntimeException(e);
+ }
}
-
-
}
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/filerel/FileListComponentBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/filerel/FileListComponentBean.java
2010-02-27 19:16:46 UTC (rev 1924)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/filerel/FileListComponentBean.java
2010-02-27 19:17:57 UTC (rev 1925)
@@ -11,7 +11,6 @@
import org.apache.log4j.Logger;
import cz.elvys.commons.utils.CommonUtils;
-import cz.elvys.webServer.HIBgen.Document;
import cz.elvys.webServer.HIBgen.File;
import cz.elvys.webServer.HIBgen.FileType;
import cz.elvys.webServer.beans.user.UserLoginBean;
@@ -19,6 +18,7 @@
import cz.elvys.webServer.utils.faces.MessageUtils;
import elvys.server.bl.Fact;
import elvys.server.bl.file.FileManagerBL;
+import elvys.server.bl.planning.PlanningBL;
public class FileListComponentBean {
@@ -40,7 +40,7 @@
// fields
private List<cz.elvys.webServer.HIBgen.File> files = null;
- private Document selectedDocument = null;
+ private File selectedDocument = null;
private cz.elvys.webServer.HIBgen.File updatedFile = null;
private List<FileType> allowedFileTypeObjects = null;
// registered listener
@@ -56,6 +56,7 @@
// other fields
private FileManagerBL fileManagerBL = null;
+ private PlanningBL pbl = null;
@@ -65,11 +66,11 @@
return files;
}
- public Document getSelectedDocument() {
+ public File getSelectedDocument() {
return selectedDocument;
}
- public void setSelectedDocument(Document selectedDocument) {
+ public void setSelectedDocument(File selectedDocument) {
this.selectedDocument = selectedDocument;
}
@@ -148,6 +149,7 @@
// initialize
{
fileManagerBL = Fact.getFileManagerBL();
+ pbl = Fact.getPlanningBL();
}
@@ -237,7 +239,7 @@
}
// prepare list of files
- files = fileManagerBL.listFilesOfCompany(companyID,
fileTypesToSelect);
+ files =
fileManagerBL.listFilesOfCompanyMakeSession(companyID, fileTypesToSelect);
} catch (Exception e) {
String message =
CommonUtils.prepareErrorMessage(ERROR_PREPARE_BEAN_DATA, "companyID",
companyID);
log.error(message,e);
@@ -283,15 +285,11 @@
throw new RuntimeException(message, e);
}
- // remove selected document from collection
- if (!files.remove(selectedDocument)) {
- // it means, that file is not in collection
- // do nothing
- //throw new RuntimeException("File deleting failed-
File not found in collection");
- }
-
// invalidate form values
invalidate();
+
+ // reload list
+ prepareData();
}
/**
@@ -332,7 +330,7 @@
*/
public boolean getFileHasFuturePlanning() {
try {
- boolean result =
fileManagerBL.fileHasFuturePlanning(selectedDocument);
+ boolean result =
pbl.fileHasFuturePlanning(selectedDocument);
return result;
} catch (Exception e) {
String message =
CommonUtils.prepareErrorMessage(ERROR_LOOKUP_FILE_PLANNING, "fileName",
selectedDocument != null ? selectedDocument.getOrigName() : "null" );
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/component/filerel/FileListComponentBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/component/filerel/FileListComponentBean.java
2010-02-27 19:16:46 UTC (rev 1924)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/component/filerel/FileListComponentBean.java
2010-02-27 19:17:57 UTC (rev 1925)
@@ -139,7 +139,7 @@
int companyID = BeanManager.getUser().getCompanyID();
try {
- List<File> files =
fileManagerBL.listFilesOfCompany(companyID, types);
+ List<File> files =
fileManagerBL.listFilesOfCompanyMakeSession(companyID, types);
return files;
} catch(Exception e) {
String message =
CommonUtils.prepareErrorMessage(CANNOT_SELECT_LIST,
Modified:
trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
===================================================================
---
trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
2010-02-27 19:16:46 UTC (rev 1924)
+++
trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
2010-02-27 19:17:57 UTC (rev 1925)
@@ -593,7 +593,7 @@
}
}
}
- this.files =
fileManagerBL.listFilesOfCompany(companyID,ftypesToSelect);
+ this.files =
fileManagerBL.listFilesOfCompanyMakeSession(companyID,ftypesToSelect);
} catch (Exception e) {
String message =
CommonUtils.prepareErrorMessage("Unable to load documents for company",
"companyID", companyID);
throw new RuntimeException(message,e);
Modified: trunk/server/webServer2/WebContent/salt.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/salt.xhtml 2010-02-27 19:16:46 UTC
(rev 1924)
+++ trunk/server/webServer2/WebContent/salt.xhtml 2010-02-27 19:17:57 UTC
(rev 1925)
@@ -12,8 +12,10 @@
<h:form>
<h:outputText value="pocet neosolenych: #{saltBean.notSalted}"
/>
<br/>
+ <h:inputSecret value="#{saltBean.pass}"/>
+ <br/>
<h:commandButton value="OSOLIT HESLA! CAJICKY NEPOUSTIME!!"
- immediate="true" action="#{saltBean.saltPasswords}"/>
+ immediate="false" action="#{saltBean.saltPasswords}"/>
</h:form>
</f:view>
</body>
Modified: trunk/server/webServer2/WebContent/saltResult.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/saltResult.xhtml 2010-02-27 19:16:46 UTC
(rev 1924)
+++ trunk/server/webServer2/WebContent/saltResult.xhtml 2010-02-27 19:17:57 UTC
(rev 1925)
@@ -10,6 +10,7 @@
<body>
<f:view>
<h:outputText value="Posoleno bylo:
#{saltBean.saltedOnLastOperation}" />
+ <h:outputText value="Opravenych souboru:
#{saltBean.repairedFilesOnLastOp}" />
</f:view>
</body>
</html>
Other related posts:
- » [elvystrac] r1925 - (1)deleting of files upgraded - elvys
