|
From: <pe...@us...> - 2003-11-21 04:44:15
|
Update of /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/configuration
In directory sc8-pr-cvs1:/tmp/cvs-serv10533/src/java/org/neuclear/commons/configuration
Modified Files:
Configuration.java ConfigurationException.java
Log Message:
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
Otherwise You will Finaliate.
Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final.
This should hopefully make everything more stable (and secure).
Index: Configuration.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/configuration/Configuration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Configuration.java 28 Oct 2003 23:43:38 -0000 1.3
--- Configuration.java 21 Nov 2003 04:43:40 -0000 1.4
***************
*** 16,22 ****
* Time: 11:34:51 AM
*/
! public class Configuration {
! private static synchronized PicoContainer getContainer(String context) throws ConfigurationException {
if (pico == null)
pico = buildContainer(context);
--- 16,22 ----
* Time: 11:34:51 AM
*/
! public final class Configuration {
! private static synchronized PicoContainer getContainer(final String context) throws ConfigurationException {
if (pico == null)
pico = buildContainer(context);
***************
*** 24,35 ****
}
! public static Object getComponent(Object type, String context) throws ConfigurationException {
return getContainer(context).getComponent(type);
}
! private static PicoContainer buildContainer(String context) throws ConfigurationException {
try {
! InputSourceRegistrationNanoContainer nc = new DomRegistrationNanoContainer.Default();
! InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(context + ".xml");
nc.registerComponents(new InputSource(in));
nc.instantiateComponents();
--- 24,35 ----
}
! public static Object getComponent(final Object type, final String context) throws ConfigurationException {
return getContainer(context).getComponent(type);
}
! private static PicoContainer buildContainer(final String context) throws ConfigurationException {
try {
! final InputSourceRegistrationNanoContainer nc = new DomRegistrationNanoContainer.Default();
! final InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(context + ".xml");
nc.registerComponents(new InputSource(in));
nc.instantiateComponents();
Index: ConfigurationException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/configuration/ConfigurationException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ConfigurationException.java 20 Sep 2003 23:18:12 -0000 1.1.1.1
--- ConfigurationException.java 21 Nov 2003 04:43:40 -0000 1.2
***************
*** 7,12 ****
* Time: 4:50:18 PM
*/
! public class ConfigurationException extends Exception {
! public ConfigurationException(Throwable throwable) {
super(throwable);
}
--- 7,12 ----
* Time: 4:50:18 PM
*/
! public final class ConfigurationException extends Exception {
! public ConfigurationException(final Throwable throwable) {
super(throwable);
}
|