lenya/src/java/org/apache/lenya/cms/authoring DefaultCreator.java,1.16,1.17

Update of /repository/lenya/src/java/org/apache/lenya/cms/authoring
In directory erbium:/tmp/cvs-serv16554/src/java/org/apache/lenya/cms/authoring

Modified Files:
	DefaultCreator.java 
Log Message:
Only act on configuration parameters which are non-null.


Index: DefaultCreator.java
===================================================================
RCS file: /repository/lenya/src/java/org/apache/lenya/cms/authoring/DefaultCreator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DefaultCreator.java	24 Apr 2003 13:52:37 -0000	1.16
--- DefaultCreator.java	7 May 2003 16:41:48 -0000	1.17
***************
*** 66,73 ****
  	static Category log = Category.getInstance(DefaultCreator.class);
  
!     protected String resourceName;
!     protected String resourceMetaName;
!     protected String sampleResourceName;
!     protected String sampleMetaName;
  
      /**
--- 66,78 ----
  	static Category log = Category.getInstance(DefaultCreator.class);
  
!     protected final String RESOURCE_NAME = "resource-name";
!     protected final String RESOURCE_META_NAME = "resource-meta-name";
!     protected final String SAMPLE_NAME = "sample-name";
!     protected final String SAMPLE_META_NAME = "sample-meta-name";
! 
!     protected String resourceName = null;
!     protected String resourceMetaName = null;
!     protected String sampleResourceName = null;
!     protected String sampleMetaName = null;
  
      /**
***************
*** 81,88 ****
          }
  
! 	resourceName = conf.getChild("resource-name").getValue("index.xml");
! 	resourceMetaName = conf.getChild("resource-meta-name").getValue("index-meta.xml");
! 	sampleResourceName = conf.getChild("sample-name").getValue("sampleindex.xml");
! 	sampleMetaName = conf.getChild("sample-meta-name").getValue("samplemeta.xml");
      }
  
--- 86,101 ----
          }
  
! 	if (conf.getChild(RESOURCE_NAME, false) != null) {
! 	    resourceName = conf.getChild(RESOURCE_NAME).getValue("index.xml");
! 	}
! 	if (conf.getChild(RESOURCE_META_NAME, false) != null) {
! 	    resourceMetaName  = conf.getChild(RESOURCE_META_NAME).getValue("index-meta.xml");
! 	}
! 	if (conf.getChild(SAMPLE_NAME, false) != null) {
! 	    sampleResourceName  = conf.getChild(SAMPLE_NAME).getValue("sampleindex.xml");
! 	}
! 	if (conf.getChild(SAMPLE_META_NAME, false) != null) {
! 	    sampleMetaName = conf.getChild(SAMPLE_META_NAME).getValue("samplemeta.xml");
! 	}
      }