ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationServant.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationServant.java (file contents):
Revision 1.2 by tdb, Thu Nov 9 03:29:13 2000 UTC vs.
Revision 1.12 by ajm, Tue Nov 21 21:58:52 2000 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2  
3   //---IMPORTS---
4 < import core.*;
4 > import uk.ac.ukc.iscream.core.*;
5   import java.util.*;
6   import java.io.*;
7 + import java.text.DateFormat;
8  
9   /**
10   * An implementation of the Configuration IDL
# Line 11 | Line 12 | import java.io.*;
12   * set their configuration from a central location.
13   *
14   * When classes want their configuration, they contact
15 < * the Configurator, which will locate their config,
15 > * the ConfigurationManager, which will locate their config,
16   * open it and pass it to a Configuration object which is
17   * then passed back to the calling class.
18   *
# Line 36 | Line 37 | class ConfigurationServant extends ConfigurationPOA {
37  
38      /**
39       * Creates a new ConfigurationServant taking a hook
40 <     * to a file containing the configuration.
40 >     * to a Properties object containing the configuration.
41       *
42 <     * @param propertiesStream an InputStream connected to the configuration
42 >     * @param properties a Properties object that contains the full properties for this configuration
43 >     * @param fileList the list of config files used to build this configuration
44 >     * @param lastModified the most recent last modified value for the file list
45 >     * @param logRef a reference to the logger system
46       */
47 <    ConfigurationServant(File configurationFile, Logger logRef) {
47 >    ConfigurationServant(Properties properties, String fileList, long lastModified, Logger logRef) {
48 >        // assign local variables
49 >        _properties = properties;
50 >        _lastModified = lastModified;
51 >        _fileList = fileList;
52          _logRef = logRef;
53 <        _logRef.write(this.toString(), "created");
54 <        try {
55 <            InputStream configurationStream = new FileInputStream(configurationFile);
56 <            _properties.load(configurationStream);
49 <        } catch (Exception e) {
50 <            // ****************************************
51 <            // either IOException from the .load() or
52 <            // a SecurityException or FileNotFoundException from
53 <            // the inputStream, not sure what to do yet!!!
54 <        }
53 >        _logRef.write(this.toString(), Logger.SYSINIT, "created");
54 >        String date = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM).format(new Date(getLastModified()));
55 >        _logRef.write(this.toString(), Logger.SYSMSG, "last modified - " + date);
56 >        _logRef.write(this.toString(), Logger.DEBUG, "file list - " + _fileList);
57      }
58  
59   //---PUBLIC METHODS---
# Line 68 | Line 70 | class ConfigurationServant extends ConfigurationPOA {
70      }
71      
72      /**
73 <     * Overrides the {@link #java.lang.Object.toString() Object.toString()}
73 >     * Overrides the {@link java.lang.Object#toString() Object.toString()}
74       * method to provide clean logging (every class should have this).
75       *
76       * @return the name of this class and its CVS revision
77       */
78      public String toString() {
79 <        return this.getClass().getName() + ":" + REVISION;
79 >        return this.getClass().getName() + "(" + REVISION.substring(11, REVISION.length() - 2) + ")";
80      }
81  
82   //---PRIVATE METHODS---
83  
84 +    /**
85 +     * Overridden for debugging purposes
86 +     * to see when an instance of this class
87 +     * is destroyed
88 +     */
89 +    protected void finalize() throws Throwable {
90 +        _logRef.write(this.toString(), Logger.DEBUG, "finalized (ick, us english!)");
91 +    }
92 +
93   //---ACCESSOR/MUTATOR METHODS---
94  
95 +    /**
96 +     * Returns the date stamp of the configuration file
97 +     * this object is using.
98 +     *
99 +     * @return the last modified time for the file
100 +     */
101 +    public long getLastModified() {
102 +        return _lastModified;
103 +    }
104 +
105 +    /**
106 +     * Returns the list of files used to build the Properties
107 +     * this object is using.
108 +     *
109 +     * @return the list of files
110 +     */
111 +    public String getFileList() {
112 +        return _fileList;
113 +    }
114 +
115   //---ATTRIBUTES---
116  
117      /**
# Line 93 | Line 124 | class ConfigurationServant extends ConfigurationPOA {
124       */
125      private Logger _logRef;
126  
127 +    /**
128 +     * The date stamp of the configuration file
129 +     * this object is using
130 +     */
131 +    private long _lastModified;
132 +    
133 +    
134 +    /**
135 +     * The list of files that were used to build this configuration
136 +     */
137 +    private String _fileList;
138 +    
139   //---STATIC ATTRIBUTES---
140  
141   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines