jvanzyl     01/06/14 08:02:34

  Modified:    src/java/org/apache/turbine/services
                        BaseUnicastRemoteService.java
  Log:
  - dan i don't know much about the use of this but you're probably
    going to have to implement some things.
  
    would it be possible to use composition here instead of
    extending the BaseUnicastObject so that we can share methods
    from the base classes. just a thought.
  
  Revision  Changes    Path
  1.5       +16 -70    
jakarta-turbine/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
  
  Index: BaseUnicastRemoteService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BaseUnicastRemoteService.java     2001/06/07 21:00:24     1.4
  +++ BaseUnicastRemoteService.java     2001/06/14 15:02:33     1.5
  @@ -1,66 +1,11 @@
   package org.apache.turbine.services;
   
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software itself,
  - *    if and wherever such third-party acknowledgments normally appear.
  - *
  - * 4. The names "Apache" and "Apache Software Foundation" and 
  - *    "Apache Turbine" must not be used to endorse or promote products 
  - *    derived from this software without prior written permission. For 
  - *    written permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without 
  - *    prior written permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
  -
   import java.util.Properties;
   import java.rmi.RemoteException;
   import java.rmi.server.UnicastRemoteObject;
   import javax.servlet.ServletConfig;
   
  -import org.apache.turbine.util.TurbineException;
  -
  +import org.apache.log4j.Category;
   import org.apache.velocity.runtime.configuration.Configuration;
   
   /**
  @@ -74,7 +19,7 @@
   {
       protected Configuration configuration;
       private boolean isInitialized;
  -    private InitableBroker initableBroker;
  +    //private InitableBroker initableBroker;
       private String name;
       private Properties properties;
       private ServiceBroker serviceBroker;
  @@ -83,7 +28,7 @@
           throws RemoteException
       {
           isInitialized = false;
  -        initableBroker = null;
  +        //initableBroker = null;
           properties = null;
           name = null;
           serviceBroker = null;
  @@ -116,6 +61,7 @@
           setInit(true);
       }
   
  +    /*
       public void setInitableBroker(InitableBroker broker)
       {
           this.initableBroker = broker;
  @@ -125,6 +71,7 @@
       {
           return initableBroker;
       }
  +    */
   
       public void init(Object data)
           throws InitializationException
  @@ -174,22 +121,11 @@
           this.name = name;
       }
   
  -    public String getName()
  +    public String setName()
       {
           return name;
       }
   
  -    /**
  -     * Returns the current status of this Service.
  -     *
  -     * @return The current status of this Service.
  -     */
  -    public String getStatus()
  -        throws TurbineException
  -    {
  -        return (getInit() ? "Initialized." : "Uninitialized.");
  -    }
  -
       public ServiceBroker getServiceBroker()
       {
           return serviceBroker;
  @@ -199,4 +135,14 @@
       {
           this.serviceBroker = broker;
       }
  +
  +    public String getRealPath(String path)
  +    {
  +        return null;
  +    }        
  +
  +    public Category getCategory()
  +    {
  +        return null;
  +    }        
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to