equal
deleted
inserted
replaced
100 new Object[]{ namespace, |
100 new Object[]{ namespace, |
101 fullName }); //"Don't currently do anything with namespace "+namespace+" in property: "+fullName); |
101 fullName }); //"Don't currently do anything with namespace "+namespace+" in property: "+fullName); |
102 |
102 |
103 try |
103 try |
104 { |
104 { |
105 result = System.getProperty(propName); |
105 result = SecuritySupport.getSystemProperty(propName); |
106 |
106 |
107 if (null == result) |
107 if (null == result) |
108 { |
108 { |
109 |
109 |
110 // result = System.getenv(propName); |
110 // result = System.getenv(propName); |
122 } |
122 } |
123 else |
123 else |
124 { |
124 { |
125 try |
125 try |
126 { |
126 { |
127 result = System.getProperty(fullName); |
127 result = SecuritySupport.getSystemProperty(fullName); |
128 |
128 |
129 if (null == result) |
129 if (null == result) |
130 { |
130 { |
131 |
131 |
132 // result = System.getenv(fullName); |
132 // result = System.getenv(fullName); |
163 * |
163 * |
164 * @param file The string name of the property file. The name |
164 * @param file The string name of the property file. The name |
165 * should already be fully qualified as path/filename |
165 * should already be fully qualified as path/filename |
166 * @param target The target property bag the file will be placed into. |
166 * @param target The target property bag the file will be placed into. |
167 */ |
167 */ |
168 private void loadPropertyFile(String file, Properties target) |
168 public void loadPropertyFile(String file, Properties target) |
169 { |
169 { |
170 try |
170 try |
171 { |
171 { |
172 // Use SecuritySupport class to provide priveleged access to property file |
172 // Use SecuritySupport class to provide priveleged access to property file |
173 |
|
174 InputStream is = SecuritySupport.getResourceAsStream(ObjectFactory.findClassLoader(), |
173 InputStream is = SecuritySupport.getResourceAsStream(ObjectFactory.findClassLoader(), |
175 file); |
174 file); |
176 |
175 |
177 // get a buffered version |
176 // get a buffered version |
178 BufferedInputStream bis = new BufferedInputStream(is); |
177 BufferedInputStream bis = new BufferedInputStream(is); |