lenya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andr...@apache.org
Subject cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/publication Publication.java
Date Mon, 18 Aug 2003 17:12:56 GMT
andreas     2003/08/18 10:12:56

  Modified:    src/java/org/apache/lenya/cms/publication Publication.java
  Log:
  simplified obtaining config file
  
  Revision  Changes    Path
  1.25      +3 -11     cocoon-lenya/src/java/org/apache/lenya/cms/publication/Publication.java
  
  Index: Publication.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/Publication.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Publication.java	11 Aug 2003 14:46:28 -0000	1.24
  +++ Publication.java	18 Aug 2003 17:12:55 -0000	1.25
  @@ -97,7 +97,7 @@
       private static final String[] areas =
           { AUTHORING_AREA, LIVE_AREA, INFO_AREA, ADMIN_AREA };
   
  -    private static final String configFileName = "publication.xconf";
  +    protected static final String CONFIGURATION_FILE = CONFIGURATION_PATH + File.separator
+ "publication.xconf";
   
       private String id;
       private PublishingEnvironment environment;
  @@ -131,15 +131,7 @@
           environment = new PublishingEnvironment(servletContextPath, id);
   
           File configFile =
  -            new File(
  -                servletContext,
  -                PUBLICATION_PREFIX
  -                    + File.separator
  -                    + id
  -                    + File.separator
  -                    + CONFIGURATION_PATH
  -                    + File.separator
  -                    + configFileName);
  +            new File(getDirectory(), CONFIGURATION_FILE);
           DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
   
           Configuration config;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org


Mime
View raw message