cvs commit: xml-soap/java/src/org/apache/soap/server DefaultConfigManager.java ServiceManager.java

[du...@apache.org]

duftler     01/02/01 19:32:05

  Modified:    java/src/org/apache/soap/server DefaultConfigManager.java
                        ServiceManager.java
  Log:
  Made the reading/writing of deployedservices.ds by the
    DefaultConfigManager behave the same as the reading/writing of soap.xml
    by the ServiceManager.
  
  Revision  Changes    Path
  1.7       +12 -6     xml-soap/java/src/org/apache/soap/server/DefaultConfigManager.java
  
  Index: DefaultConfigManager.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/server/DefaultConfigManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultConfigManager.java	2001/02/02 02:15:17	1.6
  +++ DefaultConfigManager.java	2001/02/02 03:32:05	1.7
  @@ -64,6 +64,7 @@
   import org.apache.soap.* ;
   import org.apache.soap.rpc.* ;
   import org.apache.soap.server.* ;
  +import org.apache.soap.server.http.* ;
   import org.apache.soap.util.* ;
   
   /**
  @@ -92,12 +93,13 @@
    *
    */
   public class DefaultConfigManager implements ConfigManager {
  -  protected Hashtable dds      = new Hashtable();
  -  protected String    filename = "DeployedServices.ds";
  -  protected String[]  serviceNamesCache ;
  +  protected Hashtable      dds      = new Hashtable();
  +  protected String         filename = "DeployedServices.ds";
  +  protected String[]       serviceNamesCache ;
  +  protected ServletContext context  = null;
   
     public void setContext(ServletContext context) {
  -    // Not used in this implementation.
  +    this.context = context;
     }
   
     public void setOptions( Hashtable options ) {
  @@ -154,7 +156,9 @@
       // load in a serialized thing
       dds = null ;
       try {
  -      FileInputStream fis = new FileInputStream (filename);
  +      File file = ServerHTTPUtils.getFileFromNameAndContext(filename,
  +                                                            context);
  +      FileInputStream fis = new FileInputStream (file);
         ObjectInputStream is = new ObjectInputStream (fis);
   
         dds = (Hashtable) is.readObject ();
  @@ -168,7 +172,9 @@
   
     public void saveRegistry() throws SOAPException {
       try {
  -      FileOutputStream fos = new FileOutputStream (filename);
  +      File file = ServerHTTPUtils.getFileFromNameAndContext(filename,
  +                                                            context);
  +      FileOutputStream fos = new FileOutputStream (file);
         ObjectOutputStream os = new ObjectOutputStream (fos);
   
         os.writeObject (dds);
  
  
  
  1.11      +5 -1      xml-soap/java/src/org/apache/soap/server/ServiceManager.java
  
  Index: ServiceManager.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/server/ServiceManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ServiceManager.java	2001/02/02 02:15:17	1.10
  +++ ServiceManager.java	2001/02/02 03:32:05	1.11
  @@ -196,8 +196,12 @@
   
       // When all is said and done - if there still isn't a configMgr
       // then use the default one.
  -    if ( configMgr == null )
  +    if ( configMgr == null ) {
         configMgr = new DefaultConfigManager( );
  +
  +      // Set the servlet context.
  +      configMgr.setContext(context);
  +    }
   
       try {
         configMgr.init();