Author: tdraier
Date: Mon Jan 7 16:28:53 2008
New Revision: 19462
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19462&repname=
=3Djahia
Log:
fixed delete site, correctly delete entries from jahia_workflow and jahia_l=
anguages_states
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaLanguagesStatesDAO.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaSiteDAO.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=3D19462&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 Mon Jan 7 16:28:53 2008
@@ -105,4 +105,18 @@
deleteTemplate.setFlushMode(HibernateTemplate.FLUSH_EAGER);
deleteTemplate.deleteAll(entries);
}
+
+ public void clearEntriesForSite(Integer siteid) {
+ final HibernateTemplate template =3D getHibernateTemplate();
+ template.setCacheQueries(true);
+ template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
+ List entries =3D template.find(
+ "from JahiaLanguagesStates l where l.siteID=3D?",
+ new Object[] { siteid });
+
+ final HibernateTemplate deleteTemplate =3D getHibernateTemplate();
+ deleteTemplate.setCacheQueries(false);
+ deleteTemplate.setFlushMode(HibernateTemplate.FLUSH_EAGER);
+ deleteTemplate.deleteAll(entries);
+ }
}
\ No newline at end of file
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaSiteDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaSiteDAO.java&rev=3D19462&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/hibernate/dao/JahiaSiteDAO.java (original)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaSiteDAO.java Mon Jan =
7 16:28:53 2008
@@ -288,6 +288,9 @@
JahiaGroupDAO groupDAO =3D (JahiaGroupDAO) context.getBean("jahiaG=
roupDAO");
JahiaGroupAccessDAO groupAccessDAO =3D (JahiaGroupAccessDAO) conte=
xt.getBean("jahiaGroupAccessDAO");
JahiaSavedSearchDAO savedSearchDAO =3D (JahiaSavedSearchDAO) conte=
xt.getBean("jahiaSavedSearchDAO");
+ JahiaWorkflowDAO jahiaWorkflowDAO =3D (JahiaWorkflowDAO) context.g=
etBean("jahiaWorkflowDAO");
+ JahiaLanguagesStatesDAO jahiaLanguagesStatesDAO =3D (JahiaLanguage=
sStatesDAO) context.getBean("jahiaLanguagesStatesDAO");
+
// We delete All fields
Map map =3D fieldsDataDAO.deleteAllFieldsFromSite(siteID);
acls.putAll(map);
@@ -312,9 +315,10 @@
while (iterator.hasNext()) {
Object o =3D iterator.next();
if (o instanceof ObjectKey) {
- ObjectKey aclID =3D (ObjectKey) o;
+ ObjectKey objectKey =3D (ObjectKey) o;
try {
- instance.removeAllObjectXRefs(aclID);
+ instance.removeAllObjectXRefs(objectKey);
+ jahiaWorkflowDAO.delete(objectKey.toString());
} catch (JahiaException e) {
e.printStackTrace(); //To change body of catch statem=
ent use File | Settings | File Templates.
}
@@ -324,9 +328,9 @@
while (iterator.hasNext()) {
Object o =3D iterator.next();
if (o instanceof ObjectKey) {
- ObjectKey aclID =3D (ObjectKey) o;
+ ObjectKey definitionKey =3D (ObjectKey) o;
try {
- instance.removeAllObjectXRefs(aclID);
+ instance.removeAllObjectXRefs(definitionKey);
} catch (JahiaException e) {
e.printStackTrace(); //To change body of catch statem=
ent use File | Settings | File Templates.
}
@@ -338,6 +342,8 @@
markupDAO.deleteMarkupSettingsBySite(siteID);
// We delete all objects
objectDAO.deleteAllFromSite(siteID);
+
+ jahiaLanguagesStatesDAO.clearEntriesForSite(siteID);
// We delete all langs (list maps)
languageListDAO.deleteAllFromSite(siteID);
languageMappingDAO.deleteAllFromSite(siteID);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
