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

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

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

Modified Files:
	Configuration.java 
Log Message:
Fixed SmtpSender it now sends the messages.
Refactored CommandLineSigner. Now it simply signs files read from command line. However new class IdentityCreator
is subclassed and creates new Identities. You can subclass CommandLineSigner to create your own variants.
Several problems with configuration. Trying to solve at the moment. Updated PicoContainer to beta-2

Index: Configuration.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/configuration/Configuration.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Configuration.java	20 Sep 2003 23:18:12 -0000	1.1.1.1
--- Configuration.java	25 Oct 2003 00:39:27 -0000	1.2
***************
*** 1,9 ****
  package org.neuclear.commons.configuration;
  
  import org.picocontainer.PicoContainer;
- import org.picocontainer.PicoRegistrationException;
  import org.picocontainer.PicoInitializationException;
! import org.nanocontainer.InputSourceRegistrationNanoContainer;
! import org.nanocontainer.DomRegistrationNanoContainer;
  import org.xml.sax.InputSource;
  
--- 1,9 ----
  package org.neuclear.commons.configuration;
  
+ import org.nanocontainer.DomRegistrationNanoContainer;
+ import org.nanocontainer.InputSourceRegistrationNanoContainer;
  import org.picocontainer.PicoContainer;
  import org.picocontainer.PicoInitializationException;
! import org.picocontainer.PicoRegistrationException;
  import org.xml.sax.InputSource;
  
***************
*** 11,15 ****
  
  /**
-  * 
   * User: pelleb
   * Date: Aug 13, 2003
--- 11,14 ----
***************
*** 18,32 ****
  public class Configuration {
  
!     public static synchronized PicoContainer getContainer() throws ConfigurationException {
!           if (pico==null)
!             pico=buildContainer();
!           return pico;
      }
  
!     private static PicoContainer buildContainer()throws ConfigurationException{
          try {
              InputSourceRegistrationNanoContainer nc = new DomRegistrationNanoContainer.Default();
!             nc.registerComponents(new InputSource(Configuration.class.getClassLoader().getResourceAsStream("neuclear-conf.xml")));
!             nc.instantiateComponents();
              return nc;
          } catch (ParserConfigurationException e) {
--- 17,30 ----
  public class Configuration {
  
!     public static synchronized PicoContainer getContainer(Class context) throws ConfigurationException {
!         if (pico == null)
!             pico = buildContainer(context);
!         return pico;
      }
  
!     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) {
***************
*** 35,43 ****
--- 33,46 ----
              throw new ConfigurationException(e);
          } catch (ClassNotFoundException e) {
+             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;