axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r348877 - in /webservices/axis2/trunk/java/modules: codegen/test-resources/xmls/ core/src/org/apache/axis2/context/ core/src/org/apache/axis2/deployment/ core/src/org/apache/axis2/engine/ core/src/org/apache/axis2/storage/ core/src/org/apac...
Date Fri, 25 Nov 2005 04:52:49 GMT
Author: dims
Date: Thu Nov 24 20:52:34 2005
New Revision: 348877

URL: http://svn.apache.org/viewcvs?rev=348877&view=rev
Log:
Garbage Collection:
- AxisStorage is too simplistic for Sandesha's needs. get rid of it.
- Don't need Context Serialization either. get rid of that too.
- Remove serializable stuff from context hierarchy and remove the read/write methods as well.


Removed:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/AxisStorage.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AbstractStorage.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisMemoryStorage.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/AxisStorageTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/storage/impl/AbstractStorageTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/storage/impl/AxisFileStorageTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/storage/impl/AxisMemoryStorageTest.java
Modified:
    webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/dispatch_repo/axis2.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/hostConfigrepo/axis2.xml

Modified: webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/test-resources/xmls/axis2.xml Thu Nov 24
20:52:34 2005
@@ -9,14 +9,6 @@
 
     <parameter name="seralizeLocation" locked="false">.</parameter>
 
-    <!--Registering Axis Storage Class if you comment this default one will -->
-    <!--does the job (org.apache.axis2.storage.impl.AxisMemoryStorage) , if you-->
-    <!--want to register new one write a class by extanding AbastractStorage-->
-    <!--and put that name here-->
-    <axisStorage class="org.apache.axis2.storage.impl.AxisMemoryStorage">
-        <parameter name="StoreLocation" locked="false">N:S</parameter>
-    </axisStorage>
-
     <!-- ================================================= -->
     <!-- Message Receivers -->
     <!-- ================================================= -->

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java
Thu Nov 24 20:52:34 2005
@@ -28,7 +28,7 @@
 /**
  *  This is the top most level of the Context hierachy and is a bag of properties. 
  */
-public abstract class AbstractContext implements Serializable {
+public abstract class AbstractContext {
 
     protected transient HashMap nonPersistentMap;
     protected final HashMap persistentMap;
@@ -36,15 +36,6 @@
 
 	public abstract void init (AxisConfiguration axisConfiguration) throws AxisFault;
 	
-    private void writeObject(ObjectOutputStream out) throws IOException {
-    	out.defaultWriteObject();    	
-    }
-
-    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
{
-    	in.defaultReadObject();
-    	nonPersistentMap = new HashMap ();
-    }
-    
     protected AbstractContext(AbstractContext parent) {
         this.persistentMap = new HashMap();
         this.nonPersistentMap = new HashMap();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
Thu Nov 24 20:52:34 2005
@@ -19,7 +19,6 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.description.AxisServiceGroup;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.storage.AxisStorage;
 import org.apache.axis2.util.UUIDGenerator;
 import org.apache.axis2.util.threadpool.ThreadFactory;
 import org.apache.axis2.util.threadpool.ThreadPool;
@@ -40,10 +39,6 @@
 public class ConfigurationContext extends AbstractContext {
 
     private transient AxisConfiguration axisConfiguration;
-    private AxisStorage storage;
-
-    private Map sessionContextMap;
-    private Map moduleContextMap;
 
     private transient ThreadFactory threadPool;
 
@@ -98,15 +93,6 @@
         }
     }
 
-    private void writeObject(ObjectOutputStream out) throws IOException {
-        out.defaultWriteObject();
-    }
-
-    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
{
-        in.defaultReadObject();
-        threadPool = new ThreadPool();
-    }
-
     /**
      */
     public AxisConfiguration getAxisConfiguration() {
@@ -163,15 +149,6 @@
     public ServiceContext getServiceContext(String serviceInstanceID) {
         return (ServiceContext) this.serviceContextMap.get(serviceInstanceID);
     }
-
-    public AxisStorage getStorage() {
-        return axisConfiguration.getAxisStorage();   //storage;
-    }
-
-    public void setStorage(AxisStorage storage) {
-        this.storage = storage;
-    }
-
 
     /**
      * Returns the thread factory.

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
Thu Nov 24 20:52:34 2005
@@ -48,27 +48,6 @@
             AxisConfiguration configuration = deploymentEngine.load();
             PhaseResolver phaseResolver = new PhaseResolver(configuration);
 
-            Parameter parameter = configuration.getParameter("seralizeLocation");
-            String serializeLocation = ".";
-            if (parameter !=null) {
-                serializeLocation = ((String)parameter.getValue()).trim();
-            }
-            File objFile = new File(serializeLocation,"Axis2.obj");
-            if(objFile.exists()){
-                try {
-                    FileInputStream filein = new FileInputStream(objFile);
-                    ObjectInputStream in = new ObjectInputStream(filein);
-                    Object obj = in.readObject();
-                    if(obj instanceof ConfigurationContext){
-                        configurationContext = (ConfigurationContext)obj;
-                        configurationContext.init(configuration);
-                    }
-                } catch (IOException e) {
-                    log.info(e.getMessage());
-                } catch (ClassNotFoundException e) {
-                    log.info(e.getMessage());
-                }
-            }
             if(configurationContext == null){
                 configurationContext = new ConfigurationContext(configuration);
             }
@@ -96,22 +75,6 @@
                     new DeploymentEngine().loadClient(axis2home);
             PhaseResolver phaseResolver = new PhaseResolver(configuration);
 
-            File objFile = new File("./Axis2.obj");
-            if(objFile.exists()){
-                try {
-                    FileInputStream filein = new FileInputStream(objFile);
-                    ObjectInputStream in = new ObjectInputStream(filein);
-                    Object obj = in.readObject();
-                    if(obj instanceof ConfigurationContext){
-                        engineContext = (ConfigurationContext)obj;
-                        engineContext.init(configuration);
-                    }
-                } catch (IOException e) {
-                    log.info(e.getMessage());
-                } catch (ClassNotFoundException e) {
-                    log.info(e.getMessage());
-                }
-            }
             if(engineContext == null){
                 engineContext = new ConfigurationContext(configuration);
             }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
Thu Nov 24 20:52:34 2005
@@ -204,26 +204,6 @@
             axisOperation = axisService.getOperation(axisOperationName);
     }
 
-    private void writeObject(ObjectOutputStream out) throws IOException {
-        if (transportIn != null)
-            transportInName = transportIn.getName();
-        if (transportOut != null)
-            transportOutname = transportOut.getName();
-        if (axisServiceGroup != null)
-            serviceGroupId = axisServiceGroup.getServiceGroupName();
-        if (axisService != null)
-            serviceDescName = axisService.getName();
-        if (axisOperation != null)
-            axisOperationName = axisOperation.getName();
-
-        out.defaultWriteObject();
-    }
-
-    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
{
-        in.defaultReadObject();
-    }
-
-
     /**
      * Convenience Constructor. Before calling engine.send() or  engine.receive(), one must
send 
      * transport in/out

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
Thu Nov 24 20:52:34 2005
@@ -87,19 +87,6 @@
         }
     }
 
-    private void writeObject(ObjectOutputStream out) throws IOException {
-        if (axisOperation!=null)
-            operationDescName = axisOperation.getName();
-        if (axisOperation.getParent()!=null)
-            serviceDescName = axisOperation.getParent().getName();
-
-        out.defaultWriteObject();
-    }
-
-    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
{
-        in.defaultReadObject();
-    }
-
     /**
      * Constructs a new OperationContext.
      *

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java
Thu Nov 24 20:52:34 2005
@@ -47,17 +47,6 @@
     	axisService = axisConfiguration.getService(axisServiceName.getLocalPart());
     }
     
-    private void writeObject(ObjectOutputStream out) throws IOException {	
-    	if (axisService !=null)
-    		this.axisServiceName = axisService.getName();
-    	
-    	out.defaultWriteObject();
-    }
-
-    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
{
-    	in.defaultReadObject();
-    }
-    
     public ServiceContext(
         AxisService serviceConfig,
         ServiceGroupContext serviceGroupContext) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java
Thu Nov 24 20:52:34 2005
@@ -42,18 +42,6 @@
             axisServiceGroup = axisConfiguration.getServiceGroup(axisServiceGroupName);
     }
 
-    private void writeObject(ObjectOutputStream out) throws IOException {
-        if (axisServiceGroup !=null)
-            this.axisServiceGroupName = axisServiceGroup.getServiceGroupName();
-
-        out.defaultWriteObject();
-    }
-
-    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
{
-        in.defaultReadObject();
-        nonPersistentMap = new HashMap ();
-    }
-
     public ServiceGroupContext(ConfigurationContext parent ,AxisServiceGroup axisServiceGroup)
{
         super(parent);
         this.axisServiceGroup = axisServiceGroup;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
Thu Nov 24 20:52:34 2005
@@ -32,7 +32,6 @@
 import org.apache.axis2.om.OMAttribute;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.phaseresolver.PhaseMetadata;
-import org.apache.axis2.storage.AxisStorage;
 import org.apache.axis2.transport.TransportListener;
 import org.apache.axis2.transport.TransportSender;
 import org.apache.axis2.util.HostConfiguration;
@@ -109,10 +108,6 @@
             Iterator phaserders = config_element.getChildrenWithName(new QName(PHASE_ORDER));
             processPhaseOrders(phaserders);
 
-            //processing Axis Storages
-            OMElement storages = config_element.getFirstChildWithName(new QName(AXIS_STORAGE));
-            processAxisStorage(storages);
-
             Iterator moduleConfigs = config_element.getChildrenWithName(new QName(MODULECONFIG));
             processModuleConfig(moduleConfigs, axisConfiguration, axisConfiguration);
 
@@ -159,73 +154,6 @@
             throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.NO_DISPATCHER_FOUND));
         } else {
             ((AxisConfigurationImpl) axisConfiguration).setDispatchPhase(dispatchPhae);
-        }
-
-    }
-
-    private void processAxisStorage(OMElement storageElement) throws DeploymentException
{
-        AxisStorage axisStorage;
-        if (storageElement != null) {
-            OMAttribute className = storageElement.getAttribute(new QName(CLASSNAME));
-            if (className == null) {
-                throw new DeploymentException(Messages.getMessage(
-                        DeploymentErrorMsgs.INVALID_STORGE_CLASS));
-            } else {
-                String classNameStr = className.getAttributeValue();
-                Class stoarge;
-                if (classNameStr != null && !"".equals(classNameStr)) {
-                    try {
-                        stoarge = Class.forName(classNameStr, true,
-                                Thread.currentThread().getContextClassLoader());
-                        axisStorage = (AxisStorage) stoarge.newInstance();
-                        axisConfiguration.setAxisStorage(axisStorage);
-
-                        // adding storage paramters
-                        Iterator paramters = storageElement.getChildrenWithName(
-                                new QName(PARAMETERST));
-                        processParameters(paramters, axisStorage, axisConfiguration);
-
-
-                    } catch (ClassNotFoundException e) {
-                        throw new DeploymentException
-                                (Messages.getMessage(DeploymentErrorMsgs.CLASS_NOT_FOUND,
-                                        e.getMessage()));
-                    } catch (InstantiationException e) {
-                        throw new DeploymentException
-                                (Messages.getMessage(DeploymentErrorMsgs.INSTANTITAIONEXP,
-                                        e.getMessage()));
-                    } catch (IllegalAccessException e) {
-                        throw new DeploymentException
-                                (Messages.getMessage(DeploymentErrorMsgs.ILEGAL_ACESS,
-                                        e.getMessage()));
-                    }
-                } else {
-                    throw new DeploymentException(Messages.getMessage(
-                            DeploymentErrorMsgs.INVALID_STORGE_CLASS));
-                }
-
-            }
-
-        } else {
-            try {
-                //Default Storeg :  org.apache.axis2.storage.impl.AxisMemoryStorage
-                Class stoarge = Class.forName("org.apache.axis2.storage.impl.AxisMemoryStorage",
true,
-                        Thread.currentThread().getContextClassLoader());
-                axisStorage = (AxisStorage) stoarge.newInstance();
-                axisConfiguration.setAxisStorage(axisStorage);
-            } catch (ClassNotFoundException e) {
-                throw new DeploymentException
-                        (Messages.getMessage(DeploymentErrorMsgs.CLASS_NOT_FOUND,
-                                e.getMessage()));
-            } catch (InstantiationException e) {
-                throw new DeploymentException
-                        (Messages.getMessage(DeploymentErrorMsgs.INSTANTITAIONEXP,
-                                e.getMessage()));
-            } catch (IllegalAccessException e) {
-                throw new DeploymentException
-                        (Messages.getMessage(DeploymentErrorMsgs.ILEGAL_ACESS,
-                                e.getMessage()));
-            }
         }
 
     }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
Thu Nov 24 20:52:34 2005
@@ -93,8 +93,6 @@
     String DISPATCH_ORDER ="dispatchOrder";
     String DISPATCHER ="dispatcher";
 
-    String AXIS_STORAGE = "axisStorage";
-
     //element in a services.xml
     String SERVICE_ELEMENT ="service";
     String SERVICE_GROUP_ELEMENT ="serviceGroup";

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml Thu
Nov 24 20:52:34 2005
@@ -31,16 +31,6 @@
     <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
     <!--    </listener>-->
 
-    <!--Registering Axis Storage Class if you comment this default one will -->
-    <!--does the job (org.apache.axis2.storage.impl.AxisMemoryStorage) , if you-->
-    <!--want to register new one write a class by extanding AbastractStorage-->
-    <!--and put that name here-->
-    <axisStorage class="org.apache.axis2.storage.impl.AxisMemoryStorage">
-        <parameter name="StoreLocation" locked="false">N:S</parameter>
-    </axisStorage>
-
-
-
     <!-- ================================================= -->
     <!-- Message Receivers -->
     <!-- ================================================= -->

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Thu Nov 24 20:52:34 2005
@@ -23,7 +23,6 @@
 import org.apache.axis2.description.ParameterInclude;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.storage.AxisStorage;
 import org.apache.axis2.util.HostConfiguration;
 
 import javax.xml.namespace.QName;
@@ -136,11 +135,6 @@
     public HashMap getTransportsIn();
 
     public HashMap getTransportsOut();
-
-    //to get and set Axis2 storges (the class which should handle storeg)
-    public void setAxisStorage(AxisStorage axisStorage);
-
-    public AxisStorage getAxisStorage();
 
     //to check whether a given paramter is locked
     public boolean isParameterLocked(String paramterName);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
Thu Nov 24 20:52:34 2005
@@ -31,7 +31,6 @@
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.phaseresolver.PhaseMetadata;
 import org.apache.axis2.phaseresolver.PhaseResolver;
-import org.apache.axis2.storage.AxisStorage;
 import org.apache.axis2.util.HostConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -56,9 +55,6 @@
 
     private HashMap moduleConfigmap;
 
-    //to keep axis2 storage class
-    private AxisStorage axisStorage;
-
     private Hashtable faultyModules;
     private Log log = LogFactory.getLog(getClass());
     //to store hots configuration if any
@@ -341,15 +337,6 @@
 
     public HashMap getTransportsOut() {
         return transportsOut;
-    }
-
-    //to get and set Axis2 storges (the class which should handle storeg)
-    public void setAxisStorage(AxisStorage axisStorage) {
-        this.axisStorage =axisStorage;
-    }
-
-    public AxisStorage getAxisStorage() {
-        return axisStorage;
     }
 
     //to check whether a given paramter is locked

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
Thu Nov 24 20:52:34 2005
@@ -69,10 +69,9 @@
      * Here the <code>ExecutionChain</code> is created using the Phases. The
Handlers at the each Phases is ordered in
      * deployment time by the deployment module
      *
-     * @param context
+     * @param msgContext
      * @throws AxisFault
      * @see MessageContext
-     * @see ExecutionChain
      * @see Phase
      * @see Handler
      */
@@ -236,7 +235,7 @@
      * execution reach this method twice, means the sending the error handling failed an
in that case the
      * this method just log the error and exit</p>
      *
-     * @param context
+     * @param processingContext
      * @param e
      * @throws AxisFault
      */
@@ -471,53 +470,6 @@
         }
     }
 
-    /* --------------------------------------------------------------------------------------------*/
-    /* -----------------   Methods related to storage ----------------------------------------------*/
-
-    /**
-     * Stores an object in the underlying storage
-     *
-     * @param context The relevant engine context
-     * @param obj     the object to be stored
-     * @return the storage key
-     */
-    public Object store(ConfigurationContext context, Object obj) {
-        return context.getStorage().put(obj);
-    }
-
-    /**
-     * retrieves an object from the underlying storage
-     *
-     * @param context
-     * @param key
-     * @return
-     */
-    public Object retrieve(ConfigurationContext context, Object key) {
-        return context.getStorage().get(key);
-    }
-
-    /**
-     * removes an object from the underlying storage
-     *
-     * @param context
-     * @param key
-     * @return the object removed
-     */
-    public Object remove(ConfigurationContext context, Object key) {
-        return context.getStorage().remove(key);
-    }
-
-    /**
-     * Clears the underlying storage
-     *
-     * @param context
-     * @return
-     */
-    public boolean clearStorage(ConfigurationContext context) {
-        return context.getStorage().clean();
-    }
-
-
     private String getSenderFaultCode(String soapNamespace) {
         return SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
                 soapNamespace)
@@ -531,29 +483,4 @@
                 ? SOAP12Constants.FAULT_CODE_RECEIVER
                 : SOAP11Constants.FAULT_CODE_RECEIVER;
     }
-
-    /**
-     * To serilze the entier context heirarachy to a given location from top to bottom
-     *
-     * @throws AxisFault
-     */
-    public synchronized void serialize() {
-        try {
-            String serailzeLocaion = ".";
-            //output location
-            Parameter parameter = engineContext.getAxisConfiguration().getParameter("seralizeLocation");
-            if (parameter != null) {
-                serailzeLocaion = ((String) parameter.getValue()).trim();
-            }
-            FileOutputStream fileOut = new FileOutputStream(new File(serailzeLocaion, "Axis2.obj"));
-            ObjectOutputStream out = new ObjectOutputStream(fileOut);
-            out.writeObject(engineContext);
-        } catch (FileNotFoundException e) {
-            //todo has to be improved
-        } catch (IOException e) {
-            //todo has to be improved
-        }
-
-    }
-
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
Thu Nov 24 20:52:34 2005
@@ -229,7 +229,6 @@
 
     public void destroy() {
         super.destroy();
-        new AxisEngine(configContext).serialize();
     }
 
 }

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml Thu Nov
24 20:52:34 2005
@@ -4,10 +4,6 @@
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
-     <axisStorage class="org.apache.axis2.storage.impl.AxisMemoryStorage">
-        <parameter name="StoreLocation" locked="false">N:S</parameter>
-    </axisStorage>
-
     <transportReceiver name="http">
     </transportReceiver>
      <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/dispatch_repo/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/dispatch_repo/axis2.xml?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/dispatch_repo/axis2.xml
(original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/dispatch_repo/axis2.xml
Thu Nov 24 20:52:34 2005
@@ -18,11 +18,6 @@
         <dispatcher name="SOAPActionBasedDispatcher" class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
         <dispatcher name="SOAPMessageBodyBasedDispatcher" class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
     </dispatchOrder>
-    <axisStorage class="org.apache.axis2.storage.impl.AxisMemoryStorage">
-        <parameter name="StoreLocation" locked="false">N:S</parameter>
-    </axisStorage>
-
-
 
     <!-- ================================================= -->
     <!-- Message Receivers -->

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/hostConfigrepo/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/hostConfigrepo/axis2.xml?rev=348877&r1=348876&r2=348877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/hostConfigrepo/axis2.xml
(original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/hostConfigrepo/axis2.xml
Thu Nov 24 20:52:34 2005
@@ -31,16 +31,6 @@
     <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
     <!--    </listener>-->
 
-    <!--Registering Axis Storage Class if you comment this default one will -->
-    <!--does the job (org.apache.axis2.storage.impl.AxisMemoryStorage) , if you-->
-    <!--want to register new one write a class by extanding AbastractStorage-->
-    <!--and put that name here-->
-    <axisStorage class="org.apache.axis2.storage.impl.AxisMemoryStorage">
-        <parameter name="StoreLocation" locked="false">N:S</parameter>
-    </axisStorage>
-
-
-
     <!-- ================================================= -->
     <!-- Message Receivers -->
     <!-- ================================================= -->



Mime
View raw message