Author: tdraier
Date: Fri Aug 10 11:48:08 2007
New Revision: 18158
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18158&repname=
=3Djahia
Log:
use cache when getting all sites, avoid costly requests
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaSiteManager.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-manager.xml
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/shared_templat=
es/corporate_portal_templates.jar
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/shared_templat=
es/corporate_portal_templates_v2.jar
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/ma=
nager/JahiaSiteManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaSiteManager.java&rev=
=3D18158&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaSiteManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaSiteManager.java Fri Aug 10 11:48:08 2007
@@ -27,6 +27,9 @@
import org.jahia.hibernate.model.JahiaSiteProp;
import org.jahia.services.acl.JahiaBaseACL;
import org.jahia.services.sites.JahiaSite;
+import org.jahia.services.sites.JahiaSitesBaseService;
+import org.jahia.services.cache.CacheService;
+import org.jahia.services.cache.Cache;
import org.springframework.orm.ObjectRetrievalFailureException;
=
import java.util.ArrayList;
@@ -44,11 +47,16 @@
public class JahiaSiteManager {
private Log log =3D LogFactory.getLog(JahiaSiteManager.class);
private JahiaSiteDAO dao =3D null;
+ private CacheService cacheService;
=
public void setJahiaSiteDAO(JahiaSiteDAO dao) {
this.dao =3D dao;
}
=
+ public void setCacheService(CacheService cacheService) {
+ this.cacheService =3D cacheService;
+ }
+
public void saveJahiaSite(JahiaSite site) {
org.jahia.hibernate.model.JahiaSite jahiaSite =3D convertServiceJa=
hiaSiteToModelJahiaSite(site);
this.dao.save(jahiaSite);
@@ -106,7 +114,15 @@
List retList =3D new ArrayList(list.size());
for (int i =3D 0; i < list.size(); i++) {
org.jahia.hibernate.model.JahiaSite jahiaSite =3D (org.jahia.h=
ibernate.model.JahiaSite) list.get(i);
- retList.add(convertModelJahiaSiteToServiceJahiaSite(jahiaSite)=
);
+ JahiaSite convertedSite =3D null;
+ Cache cache =3D cacheService.getCache(JahiaSitesBaseService.SI=
TE_CACHE_BYID);
+ if (cache !=3D null) {
+ convertedSite =3D (JahiaSite) cache.get(jahiaSite.getId());
+ }
+ if (convertedSite =3D=3D null) {
+ convertedSite =3D convertModelJahiaSiteToServiceJahiaSite(=
jahiaSite);
+ }
+ retList.add(convertedSite);
}
return retList;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/a=
pplicationcontext-manager.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-manager.xml&r=
ev=3D18158&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-manager.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-manager.xml Fri Aug 10 11:48:08 2007
@@ -63,6 +63,9 @@
<property name=3D"jahiaSiteDAO">
<ref bean=3D"jahiaSiteDAO"/>
</property>
+ <property name=3D"cacheService">
+ <ref bean=3D"JahiaCacheService"/>
+ </property>
</bean>
</property>
</bean>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/shared_t=
emplates/corporate_portal_templates.jar
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/var/shared_templates/corporate_portal_templ=
ates.jar&rev=3D18158&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
Binary files - no diff available.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/shared_t=
emplates/corporate_portal_templates_v2.jar
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/var/shared_templates/corporate_portal_templ=
ates_v2.jar&rev=3D18158&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
Binary files - no diff available.
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
