cvs commit: jahia/core/src/java/org/jahia/hibernate/manager JahiaSiteManager.java

[Khue Nguyen]

knguyen     2005/07/25 16:37:54 CEST

  Modified files:
    core/src/java/org/jahia/hibernate/manager 
                                              JahiaSiteManager.java 
  Log:
  - complete JahiaSite/JahiaSiteProp mapping
  
  Revision  Changes    Path
  1.3       +13 -1     
jahia/core/src/java/org/jahia/hibernate/manager/JahiaSiteManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaSiteManager.java.diff?r1=1.2&r2=1.3&f=h
  
  
  
  Index: JahiaSiteManager.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaSiteManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JahiaSiteManager.java     22 Jun 2005 12:37:32 -0000      1.2
  +++ JahiaSiteManager.java     25 Jul 2005 14:37:54 -0000      1.3
  @@ -7,12 +7,15 @@
   import org.apache.commons.logging.LogFactory;
   import org.jahia.exceptions.JahiaException;
   import org.jahia.hibernate.dao.JahiaSiteDAO;
  +import org.jahia.hibernate.model.JahiaSiteProp;
   import org.jahia.services.acl.JahiaBaseACL;
   import org.jahia.services.sites.JahiaSite;
   import org.springframework.orm.ObjectRetrievalFailureException;
   
   import java.util.ArrayList;
   import java.util.List;
  +import java.util.Properties;
  +import java.util.Iterator;
   
   /**
    * Created by IntelliJ IDEA.
  @@ -115,8 +118,17 @@
               log.debug("Error while retrieving site ACL : ", je);
               acl = null;
           }
  +
  +        Properties props = new Properties();
  +        Iterator iterator = jahiaSite.getSettings().iterator();
  +        JahiaSiteProp jahiaSiteProp = null;
  +        while ( iterator.hasNext() ){
  +            jahiaSiteProp = (JahiaSiteProp)iterator.next();
  +            
props.put(jahiaSiteProp.getComp_id().getName(),jahiaSiteProp.getValue());
  +        }
  +
           JahiaSite site = new JahiaSite(id, jahiaSite.getTitle(), servername, 
jahiaSite.getKey(), active, pageId, descr,
  -                                       acl, null);
  +                                       acl, props);
           final boolean tplMode = 
integerToBoolean(jahiaSite.getTplDeploymode());
           site.setTemplatesAutoDeployMode(tplMode);
           final boolean webMode = 
integerToBoolean(jahiaSite.getWebappsDeploymode());