Author: tdraier
Date: Fri Jul 6 12:31:49 2007
New Revision: 17901
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17901&repname=
=3Djahia
Log:
add a method to get all staging objects (backport 17867)
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaLanguagesStatesDAO.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaLanguagesStatesMan=
ager.java
trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaLanguagesStatesD=
AO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaLanguagesStatesDAO.java&rev=3D17901&repname=3Dj=
ahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/dao/JahiaLanguagesStatesDAO.jav=
a (original)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaLanguagesStatesDAO.jav=
a Fri Jul 6 12:31:49 2007
@@ -63,6 +63,14 @@
return template.find(hql, new Object[]{objectKey});
}
=
+ public List findAllStagingObjects() {
+ String hql =3D "from JahiaLanguagesStates l where l.workflowState>=
1";
+ final HibernateTemplate template =3D getHibernateTemplate();
+ template.setCacheQueries(true);
+ template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
+ return template.find(hql);
+ }
+
public void clearEntries(String objectKey) {
String hql =3D "from JahiaLanguagesStates l where l.comp_id.object=
key=3D?";
final HibernateTemplate template =3D getHibernateTemplate();
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaLanguagesSta=
tesManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaLanguagesStatesManager.java&rev=3D17901&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/manager/JahiaLanguagesStatesMan=
ager.java (original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaLanguagesStatesMan=
ager.java Fri Jul 6 12:31:49 2007
@@ -26,10 +26,7 @@
import org.jahia.hibernate.model.JahiaLanguagesStatesPK;
import org.jahia.services.cache.CacheService;
=
-import java.util.Map;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Iterator;
+import java.util.*;
=
/**
* Created by IntelliJ IDEA.
@@ -84,7 +81,21 @@
}
}
=
- public void updateLanguagesStates(String objectKey, int value) {
+ public Map getAllStagingObject() {
+ Map m =3D new HashMap();
=
+ List l =3D dao.findAllStagingObjects();
+ for (Iterator iterator =3D l.iterator(); iterator.hasNext();) {
+ JahiaLanguagesStates jls =3D (JahiaLanguagesStates) iterator.n=
ext();
+ String key =3D jls.getComp_id().getObjectkey();
+ String lang =3D jls.getComp_id().getLanguageCode();
+ List langs =3D (List) m.get(key);
+ if (langs=3D=3D null) {
+ langs =3D new ArrayList();
+ m.put(key, langs);
+ }
+ langs.add(lang);
+ }
+ return m;
}
}
\ No newline at end of file
Modified: trunk/core/src/java/org/jahia/services/workflow/WorkflowService.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/workflow/WorkflowService.java&rev=3D17901&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/services/workflow/WorkflowService.java Fr=
i Jul 6 12:31:49 2007
@@ -1283,6 +1283,10 @@
return activationResults;
}
=
+ public Map getAllStagingObject() {
+ return languagesStatesManager.getAllStagingObject();
+ }
+
public Map storeLanguageState(ContentObjectKey key) throws JahiaExcept=
ion {
Map m =3D evalLanguagesStates(key);
for (Iterator iterator =3D m.keySet().iterator(); iterator.hasNext=
();) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
