[Neuclear-develop] neuclear-commons/src/java/org/neuclear/commons/configuration Configuration.java,1.2,1.3

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/configuration
In directory sc8-pr-cvs1:/tmp/cvs-serv8665/src/java/org/neuclear/commons/configuration

Modified Files:
	Configuration.java 
Log Message:
The PassPhraseDialogue now works. It simply presents itself as a simple modal dialog box asking for a passphrase.
The two SignerStore implementations both use it for the passphrase.

Index: Configuration.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/configuration/Configuration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Configuration.java	25 Oct 2003 00:39:27 -0000	1.2
--- Configuration.java	28 Oct 2003 23:43:38 -0000	1.3
***************
*** 9,12 ****
--- 9,13 ----
  
  import javax.xml.parsers.ParserConfigurationException;
+ import java.io.InputStream;
  
  /**
***************
*** 17,21 ****
  public class Configuration {
  
!     public static synchronized PicoContainer getContainer(Class context) throws ConfigurationException {
          if (pico == null)
              pico = buildContainer(context);
--- 18,22 ----
  public class Configuration {
  
!     private static synchronized PicoContainer getContainer(String context) throws ConfigurationException {
          if (pico == null)
              pico = buildContainer(context);
***************
*** 23,30 ****
      }
  
!     private static PicoContainer buildContainer(Class context) throws ConfigurationException {
          try {
              InputSourceRegistrationNanoContainer nc = new DomRegistrationNanoContainer.Default();
!             nc.registerComponents(new InputSource(context.getResourceAsStream("neuclear-conf.xml")));
              return nc;
          } catch (ParserConfigurationException e) {
--- 24,37 ----
      }
  
!     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();
              return nc;
          } catch (ParserConfigurationException e) {
***************
*** 35,47 ****
              e.printStackTrace();
              throw new ConfigurationException(e);
-         } catch (PicoInitializationException e) {
-             throw new ConfigurationException(e);
          } catch (NoClassDefFoundError e) {
              e.printStackTrace();
              throw new ConfigurationException(e);
          }
      }
  
      private static PicoContainer pico;
  
  }
--- 42,56 ----
              e.printStackTrace();
              throw new ConfigurationException(e);
          } catch (NoClassDefFoundError e) {
              e.printStackTrace();
              throw new ConfigurationException(e);
+         } catch (PicoInitializationException e) {
+             e.printStackTrace();
+             throw new ConfigurationException(e);
          }
      }
  
      private static PicoContainer pico;
+     //private static final String CONFIG_FILE_NAME = "neuclear-conf.xml";
  
  }