axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r168296 - in /webservices/axis/trunk/java/modules/core: src/org/apache/axis/context/ src/org/apache/axis/engine/ src/org/apache/axis/phaseresolver/ src/org/apache/axis/util/ test/org/apache/axis/engine/
Date Thu, 05 May 2005 07:32:18 GMT
Author: chinthaka
Date: Thu May  5 00:32:16 2005
New Revision: 168296

URL: http://svn.apache.org/viewcvs?rev=168296&view=rev
Log:
Fixing the compile errors.

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java?rev=168296&r1=168295&r2=168296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ServiceContext.java
Thu May  5 00:32:16 2005
@@ -30,13 +30,12 @@
 import org.apache.axis.description.PhasesIncludeImpl;
 import org.apache.axis.engine.AxisFault;
 
-public class ServiceContext  extends AbstractContext implements PhasesInclude{
+public class ServiceContext  extends AbstractContext{
     private AxisService serviceConfig;   
 
     public ServiceContext(AxisService serviceConfig,EngineContext engineContext) {
         super(engineContext);
         this.serviceConfig = serviceConfig;
-        this.operationContextMap = new HashMap();
     }
 
     /**

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java?rev=168296&r1=168295&r2=168296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java Thu
May  5 00:32:16 2005
@@ -79,8 +79,10 @@
 
                 // what are we suppose to do in the client side
                 // how the client side handlers are deployed ??? this is a hack and no client
side handlers
-                chain.addPhases(
-                    serviceContext.getPhases(EngineConfiguration.OUTFLOW));
+
+//                chain.addPhases(serviceContext.getPhases(EngineConfiguration.OUTFLOW));
+                  // TODO : Fix me Srinath
+                throw new UnsupportedOperationException();
             } else {
                 if (context.isServerSide() && !context.isProcessingFault()) {
                     throw new AxisFault("At the Send there must be a Service Object set at
the Server Side");
@@ -227,9 +229,9 @@
 
             ServiceContext serviceContext = context.getOperationContext().getServiceContext();
             if (serviceContext != null) {
-                chain.addPhases(
-                    serviceContext.getPhases(
-                        EngineConfiguration.FAULT_IN_FLOW));
+//                chain.addPhases(serviceContext.getPhases(EngineConfiguration.FAULT_IN_FLOW));
+                // TODO : Fix me Srinath
+                throw new UnsupportedOperationException();
             }
 
             chain.invoke(faultContext);

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java?rev=168296&r1=168295&r2=168296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
Thu May  5 00:32:16 2005
@@ -49,32 +49,36 @@
             ExecutionChain chain = msgContext.getExecutionChain();
             
             EngineContext engineContext = msgContext.getEngineContext();
-            if( engineContext.getService(serviceContext.getName()) != null){
-                engineContext.addService(serviceContext);
-            }
-            chain.addPhases(serviceContext.getPhases(EngineConfiguration.INFLOW));
+
+            // TODO : Fix me Srinath
+                throw new UnsupportedOperationException();
+//            if( engineContext.getService(serviceContext.getName()) != null){
+//                engineContext.addService(serviceContext);
+//            }
+//            chain.addPhases(serviceContext.getPhases(EngineConfiguration.INFLOW));
             
             //TODO check had the modules changes after the deployment time handler 
             //resolution and if that is the case recalculate the Handler Chain
 
             //let the each module chain the execution chain if so wished
-            EngineConfiguration engConfig = engineContext.getEngineConfig();
-            AxisGlobal axisGlobal = engConfig.getGlobal();
-            Collection modules = axisGlobal.getModules();
-            AxisModule axisModule = null;
-            for(Iterator it = modules.iterator();it.hasNext();axisModule = (AxisModule)it.next()){
-                Module module = axisModule.getModule();
-                module.engage(chain);
-            }
-            
-            modules = serviceContext.getServiceConfig().getModules();
-            for(Iterator it = modules.iterator();it.hasNext();axisModule = (AxisModule)it.next()){
-                Module module = axisModule.getModule();
-                module.engage(chain);
-            }
-            
-        } else if(msgContext.isServerSide()){
-            throw new AxisFault("Service Context is Null");
+
+//            EngineConfiguration engConfig = engineContext.getEngineConfig();
+//            AxisGlobal axisGlobal = engConfig.getGlobal();
+//            Collection modules = axisGlobal.getModules();
+//            AxisModule axisModule = null;
+//            for(Iterator it = modules.iterator();it.hasNext();axisModule = (AxisModule)it.next()){
+//                Module module = axisModule.getModule();
+//                module.engage(chain);
+//            }
+//
+//            modules = serviceContext.getServiceConfig().getModules();
+//            for(Iterator it = modules.iterator();it.hasNext();axisModule = (AxisModule)it.next()){
+//                Module module = axisModule.getModule();
+//                module.engage(chain);
+//            }
+//
+//        } else if(msgContext.isServerSide()){
+//            throw new AxisFault("Service Context is Null");
         }
 
     }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java?rev=168296&r1=168295&r2=168296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
Thu May  5 00:32:16 2005
@@ -247,83 +247,86 @@
      * @throws PhaseException
      */
     public void getOrderedHandlers(int chainType) throws PhaseException {
-        try {
-            //OrderThePhases();
 
-            HandlerMetadata[] handlers;
-            switch (chainType) {
-                case PhaseMetadata.IN_FLOW:
-                    {
-                        ArrayList inChain = new ArrayList();
-                        for (int i = 0; i < phaseholder.size(); i++) {
-                            PhaseMetadata phase =
-                                    (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
-                            handlers = phase.getOrderedHandlers();
-                            for (int j = 0; j < handlers.length; j++) {
-                                axisPhase.addHandler(handlers[j].getHandler());
-                            }
-                            inChain.add(axisPhase);
-                        }
-                        serviceContext.setPhases(inChain, EngineConfiguration.INFLOW);
-                        // service.setPhases(inChain, EngineConfiguration.INFLOW);
-                        break;
-                    }
-                case PhaseMetadata.OUT_FLOW:
-                    {
-                        ArrayList outChain = new ArrayList();
-                        for (int i = 0; i < phaseholder.size(); i++) {
-                            PhaseMetadata phase =
-                                    (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
-                            handlers = phase.getOrderedHandlers();
-                            for (int j = 0; j < handlers.length; j++) {
-                                axisPhase.addHandler(handlers[j].getHandler());
-                            }
-                            outChain.add(axisPhase);
-                        }
-                        //service.setPhases(outChain, EngineConfiguration.OUTFLOW);
-                        serviceContext.setPhases(outChain, EngineConfiguration.OUTFLOW);
-                        break;
-                    }
-                case PhaseMetadata.FAULT_IN_FLOW:
-                    {
-                        ArrayList faultInChain = new ArrayList();
-                        for (int i = 0; i < phaseholder.size(); i++) {
-                            PhaseMetadata phase =
-                                    (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
-                            handlers = phase.getOrderedHandlers();
-                            for (int j = 0; j < handlers.length; j++) {
-                                axisPhase.addHandler(handlers[j].getHandler());
-                            }
-                            faultInChain.add(axisPhase);
-                        }
-                        serviceContext.setPhases(faultInChain, EngineConfiguration.FAULT_IN_FLOW);
-                        // service.setPhases(faultInChain, EngineConfiguration.FAULT_IN_FLOW);
-                        break;
-                    }
-                case PhaseMetadata.FAULT_OUT_FLOW:
-                    {
-                        ArrayList faultOutChain = new ArrayList();
-                        for (int i = 0; i < phaseholder.size(); i++) {
-                            PhaseMetadata phase =
-                                    (PhaseMetadata) phaseholder.get(i);
-                            SimplePhase axisPhase = new SimplePhase(phase.getName());
-                            handlers = phase.getOrderedHandlers();
-                            for (int j = 0; j < handlers.length; j++) {
-                                axisPhase.addHandler(handlers[j].getHandler());
-                            }
-                            faultOutChain.add(axisPhase);
-                        }
-                        serviceContext.setPhases(faultOutChain, EngineConfiguration.FAULT_OUT_FLOW);
-                        //   service.setPhases(faultOutChain, EngineConfiguration.FAULT_IN_FLOW);
-                        break;
-                    }
-            }
-        } catch (AxisFault e) {
-            throw new PhaseException(e);
-        }
+        // TODO : Fix me Deepal
+                throw new UnsupportedOperationException();
+//        try {
+//            //OrderThePhases();
+//
+//            HandlerMetadata[] handlers;
+//            switch (chainType) {
+//                case PhaseMetadata.IN_FLOW:
+//                    {
+//                        ArrayList inChain = new ArrayList();
+//                        for (int i = 0; i < phaseholder.size(); i++) {
+//                            PhaseMetadata phase =
+//                                    (PhaseMetadata) phaseholder.get(i);
+//                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+//                            handlers = phase.getOrderedHandlers();
+//                            for (int j = 0; j < handlers.length; j++) {
+//                                axisPhase.addHandler(handlers[j].getHandler());
+//                            }
+//                            inChain.add(axisPhase);
+//                        }
+//                        serviceContext.setPhases(inChain, EngineConfiguration.INFLOW);
+//                        // service.setPhases(inChain, EngineConfiguration.INFLOW);
+//                        break;
+//                    }
+//                case PhaseMetadata.OUT_FLOW:
+//                    {
+//                        ArrayList outChain = new ArrayList();
+//                        for (int i = 0; i < phaseholder.size(); i++) {
+//                            PhaseMetadata phase =
+//                                    (PhaseMetadata) phaseholder.get(i);
+//                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+//                            handlers = phase.getOrderedHandlers();
+//                            for (int j = 0; j < handlers.length; j++) {
+//                                axisPhase.addHandler(handlers[j].getHandler());
+//                            }
+//                            outChain.add(axisPhase);
+//                        }
+//                        //service.setPhases(outChain, EngineConfiguration.OUTFLOW);
+//                        serviceContext.setPhases(outChain, EngineConfiguration.OUTFLOW);
+//                        break;
+//                    }
+//                case PhaseMetadata.FAULT_IN_FLOW:
+//                    {
+//                        ArrayList faultInChain = new ArrayList();
+//                        for (int i = 0; i < phaseholder.size(); i++) {
+//                            PhaseMetadata phase =
+//                                    (PhaseMetadata) phaseholder.get(i);
+//                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+//                            handlers = phase.getOrderedHandlers();
+//                            for (int j = 0; j < handlers.length; j++) {
+//                                axisPhase.addHandler(handlers[j].getHandler());
+//                            }
+//                            faultInChain.add(axisPhase);
+//                        }
+//                        serviceContext.setPhases(faultInChain, EngineConfiguration.FAULT_IN_FLOW);
+//                        // service.setPhases(faultInChain, EngineConfiguration.FAULT_IN_FLOW);
+//                        break;
+//                    }
+//                case PhaseMetadata.FAULT_OUT_FLOW:
+//                    {
+//                        ArrayList faultOutChain = new ArrayList();
+//                        for (int i = 0; i < phaseholder.size(); i++) {
+//                            PhaseMetadata phase =
+//                                    (PhaseMetadata) phaseholder.get(i);
+//                            SimplePhase axisPhase = new SimplePhase(phase.getName());
+//                            handlers = phase.getOrderedHandlers();
+//                            for (int j = 0; j < handlers.length; j++) {
+//                                axisPhase.addHandler(handlers[j].getHandler());
+//                            }
+//                            faultOutChain.add(axisPhase);
+//                        }
+//                        serviceContext.setPhases(faultOutChain, EngineConfiguration.FAULT_OUT_FLOW);
+//                        //   service.setPhases(faultOutChain, EngineConfiguration.FAULT_IN_FLOW);
+//                        break;
+//                    }
+//            }
+//        } catch (AxisFault e) {
+//            throw new PhaseException(e);
+//        }
     }
 
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java?rev=168296&r1=168295&r2=168296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java Thu May 
5 00:32:16 2005
@@ -48,11 +48,13 @@
         Flow flow,
         int flowtype)
         throws AxisFault {
-        ArrayList faultchain = new ArrayList();
-        SimplePhase p = new SimplePhase(Constants.PHASE_SERVICE);
-        faultchain.add(p);
-        addHandlers(flow, p);
-        serviceContext.setPhases(faultchain, flowtype);
+        // TODO : Fix me Deepal
+                throw new UnsupportedOperationException();
+//        ArrayList faultchain = new ArrayList();
+//        SimplePhase p = new SimplePhase(Constants.PHASE_SERVICE);
+//        faultchain.add(p);
+//        addHandlers(flow, p);
+//        serviceContext.setPhases(faultchain, flowtype);
     }
 
     public static void createExecutionChains(ServiceContext serviceContext)

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java?rev=168296&r1=168295&r2=168296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
Thu May  5 00:32:16 2005
@@ -110,15 +110,18 @@
         
         ServiceContext serviceContext = new ServiceContext(service,engineContext);
         engineContext.addService(serviceContext);
-        
-        serviceContext.setPhases(phases, EngineConfiguration.INFLOW);
-        engineRegistry.addService(service);
-        service.setStyle(WSDLService.STYLE_DOC);
-        mc.setTo(
-            new EndpointReference(
-                AddressingConstants.WSA_TO,
-                "axis/services/NullService/DummyOp"));
-        mc.setWSAAction(operationName.getLocalPart());
+
+        // TODO : Fix me Srinath
+                throw new UnsupportedOperationException();
+
+//        serviceContext.setPhases(phases, EngineConfiguration.INFLOW);
+//        engineRegistry.addService(service);
+//        service.setStyle(WSDLService.STYLE_DOC);
+//        mc.setTo(
+//            new EndpointReference(
+//                AddressingConstants.WSA_TO,
+//                "axis/services/NullService/DummyOp"));
+//        mc.setWSAAction(operationName.getLocalPart());
 
     }
 



Mime
View raw message