Project

General

Profile

« Previous | Next » 

Revision 4327

remove skin.configs directory.
migrate those properties to the style/skins/* properties files
do not load them during Metacat init.

View differences:

DBTransform.java
72 72
import org.xml.sax.SAXException;
73 73

  
74 74
import edu.ucsb.nceas.metacat.service.PropertyService;
75
import edu.ucsb.nceas.metacat.service.SkinPropertyService;
75 76
import edu.ucsb.nceas.metacat.util.MetaCatUtil;
76 77
import edu.ucsb.nceas.metacat.util.SystemUtil;
77 78
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
79
import edu.ucsb.nceas.utilities.SortedProperties;
78 80

  
79 81
import java.util.Properties;
80 82

  
......
277 279
          String sessionid) 
278 280
          throws Exception {
279 281
      
280
      Properties skinOptions;
282
      SortedProperties skinOptions;
281 283
      TransformerFactory tFactory;
282 284
      Transformer transformer;
283 285
      String key, value;
......
293 295
        transformer.setParameter("qformat", qformat);
294 296
        logMetacat.warn("qformat: "+qformat);
295 297
        
296
        if (MetaCatUtil.hasSkinConfig(qformat)) {
297
            skinOptions = MetaCatUtil.getSkinConfig(qformat);
298
		
299
            iterIt = skinOptions.entrySet().iterator();
298
        skinOptions = SkinPropertyService.getProperties(qformat);
299
        if (skinOptions != null) {            
300
            iterIt = skinOptions.getProperties().entrySet().iterator();
300 301
            while (iterIt.hasNext()) {
301 302
                entry = (Entry) iterIt.next();
302 303
                key = (String) entry.getKey();
303 304
                value = (String) entry.getValue();
304
                transformer.setParameter(key, value);
305
                //only include the plain properties
306
                if (key.indexOf('.') == -1) {
307
                	transformer.setParameter(key, value);
308
                }
305 309
            }
306 310
        }
307 311
        

Also available in: Unified diff