axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hemap...@apache.org
Subject svn commit: r151123 - in webservices/axis/trunk/java/dev/scratch/prototype2: ./ samples/ src/docs/ src/java/org/apache/axis/description/ src/java/org/apache/axis/engine/ src/java/org/apache/axis/impl/handlers/ src/java/org/apache/axis/impl/llom/factory/ src/java/org/apache/axis/impl/receivers/ src/java/org/apache/axis/impl/transport/http/ src/java/org/apache/axis/impl/utils/ src/java/org/apache/axis/transport/ src/samples/encoding/ src/samples/encoding/sample1/ src/samples/encoding/sample1/src/ src/samples/general/ src/samples/general/sample1/ src/samples/general/sample1/META-INF/ src/samples/sample1/ src/samples/sample2/ src/samples/userguide/ src/samples/userguide/sample1/ src/samples/userguide/sample1/src/ src/samples/userguide/sample1/src/org/ src/samples/userguide/sample1/src/org/apache/ src/test-resources/
Date Thu, 03 Feb 2005 05:37:07 GMT
Author: hemapani
Date: Wed Feb  2 21:36:58 2005
New Revision: 151123

URL: http://svn.apache.org/viewcvs?view=rev&rev=151123
Log:
add logging and rearange the samples

Added:
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/
      - copied from r151101, webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample1/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/build.xml
      - copied, changed from r151122, webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample1/build.xml
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/echo.wsdl
      - copied unchanged from r151122, webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample1/echo.wsdl
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/src/
      - copied from r151122, webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample1/src/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/general/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/general/sample1/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/general/sample1/Echo.java
      - copied unchanged from r151101, webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample2/Echo.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/general/sample1/META-INF/
      - copied from r151101, webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample2/META-INF/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/general/sample1/META-INF/service.xml
      - copied unchanged from r151122, webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample2/META-INF/service.xml
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/general/sample1/build.xml
      - copied, changed from r151101, webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample2/build.xml
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/src/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/src/org/
      - copied from r151101, webservices/axis/trunk/java/dev/scratch/prototype2/samples/org/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/src/org/apache/
      - copied from r151122, webservices/axis/trunk/java/dev/scratch/prototype2/samples/org/apache/
Removed:
    webservices/axis/trunk/java/dev/scratch/prototype2/samples/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/docs/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample1/
    webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample2/
Modified:
    webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/HandlerMetaData.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/AbstractHandler.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/factory/OMLinkedListImplFactory.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/receivers/InOutSyncReceiver.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTransportSender.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/utils/Constants.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/commons-logging.properties
    webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/log4j.properties

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml Wed Feb  2 21:36:58 2005
@@ -9,7 +9,7 @@
     xmlns:ant="jelly:ant">
     <preGoal name="test:test">
         <j:jelly xmlns="jelly:ant">
-			<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/sample2"/>
+			<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/general/sample1"/>
 			<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/deployment/service1"/>
 			<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/deployment/service2"/>
 			<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/deployment/module1"/>

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/HandlerMetaData.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/HandlerMetaData.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/HandlerMetaData.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/HandlerMetaData.java
Wed Feb  2 21:36:58 2005
@@ -35,6 +35,12 @@
        this.parameterInclude = new ParameterIncludeImpl();
        this.rules = new PhaseRule();
     }
+
+	public HandlerMetaData(QName name){
+		this();
+		this.name = name;
+	}
+
     /**
      * @return
      */

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java
Wed Feb  2 21:36:58 2005
@@ -45,6 +45,7 @@
 
     public void receive(MessageContext context) throws AxisFault {
         try {
+			log.info("starting the out flow");
 			//let us always start with a fresh EC
             context.setExecutionChain(new ExecutionChain());
             ExecutionChain chain = context.getExecutionChain();
@@ -52,6 +53,7 @@
             // Receiving is always a matter of running the transport handlers first
             AxisTransport transport = context.getTransport();
             if (transport != null) {
+            	log.info("Using the transport" + transport.getName());
                 chain.addPhases(transport.getPhases(EngineRegistry.INFLOW));
             }
             //Add the phases that are are at Global scope
@@ -66,6 +68,7 @@
             
             //Start rolling the Service Handlers will,be added by the Dispatcher 
             chain.invoke(context);
+			log.info("ending the out flow");
         } catch (Throwable e) {
             handleFault(context, e);
         }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java
Wed Feb  2 21:36:58 2005
@@ -18,6 +18,7 @@
 
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.description.HandlerMetaData;
 import org.apache.axis.impl.description.AxisService;
 import org.apache.axis.impl.handlers.AbstractHandler;
 import org.apache.axis.impl.handlers.OpNameFinder;
@@ -25,6 +26,11 @@
 import javax.xml.namespace.QName;
 
 public class Dispatcher extends AbstractHandler implements Handler {
+	public static final QName NAME = new QName("http://axis.ws.apache.org","Disapatcher");
+	public Dispatcher(){
+		init(new HandlerMetaData(NAME));
+	}
+	
     public void invoke(MessageContext msgctx) throws AxisFault{
         if(msgctx.isServerSide()){
             String uri = null;

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java
Wed Feb  2 21:36:58 2005
@@ -15,13 +15,16 @@
  */
 package org.apache.axis.engine;
 
-import org.apache.axis.context.MessageContext;
-
-import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Stack;
 
+import javax.xml.namespace.QName;
+
+import org.apache.axis.context.MessageContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * <p> This is the ordered Collection of Phases as specified by the Server.xml file.
  * this has the execution logic as well. If something goes wrong inside the 
@@ -31,13 +34,15 @@
 public class ExecutionChain {
     private HashMap phases;
     private ArrayList executionList;
-
+	private Log log = LogFactory.getLog(getClass());
+	
     public ExecutionChain() {
         phases = new HashMap();
         executionList = new ArrayList();
     }
     
     public void addPhase(Phase phase) {
+    	log.info("Phase "+ phase.getPhaseName() + "Added ");
         phases.put(phase.getPhaseName(), phase);
         executionList.add(phase);
     }
@@ -59,16 +64,19 @@
         Stack executionStack = new Stack();
         try {
             for (int i = 0; i < executionList.size(); i++) {
-                Handler phase = (Handler) executionList.get(i);
+                Phase phase = (Phase) executionList.get(i);
                 if (phase != null) {
+					log.info("Invoke the Phase "+ phase.getPhaseName());
                     executionStack.push(phase);
                     phase.invoke(msgctx);
                 }
             }
         } catch (Exception e) {
+        	log.info("Execution Chain failed with the "+e.getMessage());
             while (!executionStack.isEmpty()) {
-                Handler handler = (Handler) executionStack.pop();
-                handler.revoke(msgctx);
+				Phase phase = (Phase) executionStack.pop();
+				phase.revoke(msgctx);
+				log.info("revoke the Phase "+ phase.getPhaseName());
             }
             throw AxisFault.makeFault(e);
         }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Phase.java
Wed Feb  2 21:36:58 2005
@@ -15,12 +15,17 @@
  */
 package org.apache.axis.engine;
 
-import org.apache.axis.context.MessageContext;
-import org.apache.axis.impl.handlers.AbstractHandler;
-
 import java.util.ArrayList;
 import java.util.Stack;
 
+import javax.xml.namespace.QName;
+
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.impl.handlers.AbstractHandler;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * <p>This is Phase, a orderd collection of Handlers.
  * seems this is Handler Chain with order.</p>
@@ -30,16 +35,21 @@
     public static final String DISPATCH_PHASE = "DispatchPhase";
     public static final String SERVICE_INVOCATION = "ServiceInvocationPhase";
     public static final String SENDING_PHASE = "SendPhase";
+	public static final QName NAME = new QName("http://axis.ws.apache.org","Phase");
     
     private String phaseName;
     private ArrayList handlers;
+	private Log log = LogFactory.getLog(getClass());
+	
 
     public Phase(String phaseName) {
         handlers = new ArrayList();
         this.phaseName = phaseName;
+		init(new HandlerMetaData(NAME));
     }
 
     public void addHandler(Handler handler, int index) {
+		log.info("Handler "+ handler.getName() + "Added to place "+1 + " At the Phase "+phaseName
);
         handlers.add(index, handler);
     }
 
@@ -49,6 +59,7 @@
      * @param handler
      */
     public void addHandler(Handler handler) {
+		log.info("Handler "+ handler.getName() + "Added to the Phase "+phaseName );
         handlers.add(handler);
     }
 
@@ -65,13 +76,16 @@
             for (int i = 0; i < handlers.size(); i++) {
                 Handler handler = (Handler) handlers.get(i);
                 if (handler != null) {
+					log.info("Invoke the Handler "+ handler.getName() + "with in the Phase "+ phaseName);
                     executionStack.push(handler);
                     handler.invoke(msgctx);
                 }
             }
         } catch (Exception e) {
+			log.info("Phase "+phaseName+" failed with the "+e.getMessage());
             while (!executionStack.isEmpty()) {
                 Handler handler = (Handler) executionStack.pop();
+				log.info("revoke the Handler "+ handler.getName() + " with in the Phase "+ phaseName);
                 handler.revoke(msgctx);
             }
             throw AxisFault.makeFault(e);
@@ -81,6 +95,7 @@
     public void revoke(MessageContext msgctx) {
         for (int i = handlers.size() - 1; i > -1; i--) {
             Handler handler = (Handler) handlers.get(i);
+			log.info("revoke the Handler "+ handler.getName()+ " with in the Phase "+ phaseName);
             if (handler != null) {
                 handler.revoke(msgctx);
             }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/AbstractHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/AbstractHandler.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/AbstractHandler.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/AbstractHandler.java
Wed Feb  2 21:36:58 2005
@@ -20,6 +20,7 @@
 import org.apache.axis.description.Parameter;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.Handler;
+import org.apache.axis.impl.utils.Constants;
 
 import javax.xml.namespace.QName;
 
@@ -27,6 +28,7 @@
     protected HandlerMetaData handlerDesc;
     
     public AbstractHandler(){
+    	handlerDesc = Constants.EMPTY_HANDLER_METADATA;
     }
 
     public QName getName() {

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java
Wed Feb  2 21:36:58 2005
@@ -15,17 +15,31 @@
  */
 package org.apache.axis.impl.handlers;
 
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.HandlerMetaData;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.Constants;
 import org.apache.axis.impl.description.AxisService;
-import org.apache.axis.om.*;
-
-import javax.xml.namespace.QName;
-import java.util.Iterator;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMNode;
+import org.apache.axis.om.SOAPEnvelope;
 
 public class OpNameFinder extends AbstractHandler {
+	
+	public static final QName NAME = new QName("http://axis.ws.apache.org","OpNameFinder");
+	
+
+	public OpNameFinder(){
+		init(new HandlerMetaData(NAME));
+	}
+
     public void invoke(MessageContext msgContext) throws AxisFault {
         int style = msgContext.getMessageStyle();
         if (Constants.SOAP_STYLE_RPC_ENCODED == style || style == Constants.SOAP_STYLE_RPC_LITERAL)
{

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/factory/OMLinkedListImplFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/factory/OMLinkedListImplFactory.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/factory/OMLinkedListImplFactory.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/factory/OMLinkedListImplFactory.java
Wed Feb  2 21:36:58 2005
@@ -184,8 +184,5 @@
         env.addChild(headerImpl);
 
         return env;
-
-
     }
-
 }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/receivers/InOutSyncReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/receivers/InOutSyncReceiver.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/receivers/InOutSyncReceiver.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/receivers/InOutSyncReceiver.java
Wed Feb  2 21:36:58 2005
@@ -16,7 +16,10 @@
 
 package org.apache.axis.impl.receivers;
 
+import javax.xml.namespace.QName;
+
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.description.HandlerMetaData;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.Provider;
 import org.apache.axis.engine.Receiver;
@@ -27,7 +30,12 @@
 
 public class InOutSyncReceiver extends AbstractHandler implements Receiver {
     protected Log log = LogFactory.getLog(getClass());
+	public static final QName NAME = new QName("http://axis.ws.apache.org","InOutSyncReceiver");
+	
 
+	public InOutSyncReceiver(){
+		init(new HandlerMetaData(NAME));
+	}
     public void invoke(final MessageContext msgContext) throws AxisFault {
         if (msgContext.isNewThreadRequired()) {
             Runnable runner = new Runnable() {

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTransportSender.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTransportSender.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/HTTPTransportSender.java
Wed Feb  2 21:36:58 2005
@@ -25,7 +25,7 @@
 
 public class HTTPTransportSender extends AbstractTransportSender {
     protected OutputStream out;
-
+	
     public HTTPTransportSender(OutputStream out) {
         this.out = out;
     }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/utils/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/utils/Constants.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/utils/Constants.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/utils/Constants.java
Wed Feb  2 21:36:58 2005
@@ -17,6 +17,8 @@
 
 import java.util.Iterator;
 
+import org.apache.axis.description.HandlerMetaData;
+
 public class Constants {
 	public static final Iterator EMPTY_ITERATOR = new Iterator() {
 		public void remove() {
@@ -31,4 +33,6 @@
 			throw new UnsupportedOperationException();
 		}
 	};
+	
+	public static final HandlerMetaData EMPTY_HANDLER_METADATA = new HandlerMetaData();
 }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportSender.java
Wed Feb  2 21:36:58 2005
@@ -18,35 +18,49 @@
 
 import java.io.OutputStream;
 
+import javax.xml.namespace.QName;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.description.HandlerMetaData;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.TransportSender;
 import org.apache.axis.impl.handlers.AbstractHandler;
 import org.apache.axis.om.SOAPEnvelope;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  */
 public abstract class AbstractTransportSender extends AbstractHandler implements TransportSender
{
-
+	private Log log = LogFactory.getLog(getClass());
+	public static final QName NAME = new QName("http://axis.ws.apache.org","TransportSender");
+	
+	public AbstractTransportSender(){
+		init(new HandlerMetaData(NAME));
+	}
     public final void invoke(MessageContext msgContext) throws AxisFault {
 		OutputStream out = null;
         if (msgContext.isProcessingFault()) {
             //Means we are processing fault
             if (msgContext.getFaultTo() != null) {
+            	log.info("Obtain the output stream to send the fault flow to " + msgContext.getFaultTo().getAddress());
                 out = obtainOutputStream(msgContext, msgContext.getFaultTo());
             } else {
+				log.info("Obtain the output stream to send the fault flow to ANONYMOUS");
                 out = obtainOutputStream(msgContext);
             }
         } else {
             if (msgContext.getTo() != null) {
+				log.info("Obtain the output stream to send to To flow to " + msgContext.getTo().getAddress());
                 out = obtainOutputStream(msgContext, msgContext.getTo());
             } else if (msgContext.getReplyTo() != null) {
+				log.info("Obtain the output stream to send to ReplyTo flow to " + msgContext.getReplyTo().getAddress());
                 out = obtainOutputStream(msgContext, msgContext.getTo());
             } else {
+				log.info("Obtain the output stream to send the fault flow to ANONYMOUS");
                 out = obtainOutputStream(msgContext);
             }
         }
@@ -65,6 +79,7 @@
         }
 		
         finalizeSending();
+		log.info("Send the Response");
     }
 
     protected void startSending() {

Copied: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/build.xml
(from r151122, webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample1/build.xml)
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/build.xml?view=diff&rev=151123&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample1/build.xml&r1=151122&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/build.xml&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample1/build.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/encoding/sample1/build.xml
Wed Feb  2 21:36:58 2005
@@ -5,7 +5,7 @@
 	<property name="build.classes" location="${build}/classes"/>
 	<property name="build.lib" location="${build}/lib"/>
 	<property name="lib" location="lib"/>
-	<property name="root" location="../../../"/>
+	<property name="root" location="../../../.."/>
 	<property name="jar.dir" location="${root}/target/test-resources/deployment/services"/>
 	
 	<path id="axis.test.classpath">

Copied: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/general/sample1/build.xml
(from r151101, webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample2/build.xml)
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/general/sample1/build.xml?view=diff&rev=151123&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample2/build.xml&r1=151101&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/general/sample1/build.xml&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/sample2/build.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/general/sample1/build.xml
Wed Feb  2 21:36:58 2005
@@ -5,7 +5,7 @@
 	<property name="build.classes" location="${build}/classes"/>
 	<property name="build.lib" location="${build}/lib"/>
 	<property name="lib" location="lib"/>
-	<property name="root" location="../../../"/>
+	<property name="root" location="../../../.."/>
 	<property name="jar.dir" location="${root}/target/test-resources/deployment/services"/>
 	
 	<path id="axis.test.classpath">

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/commons-logging.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/commons-logging.properties?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/commons-logging.properties
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/commons-logging.properties
Wed Feb  2 21:36:58 2005
@@ -1,8 +1,8 @@
 # Uncomment the next line to disable all logging.
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
+#org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
 
 # Uncomment the next line to enable the simple log based logging
 #org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
 
 # Uncomment the next line to enable log4j based logging
-#org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/log4j.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/log4j.properties?view=diff&r1=151122&r2=151123
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/log4j.properties
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/log4j.properties
Wed Feb  2 21:36:58 2005
@@ -1,14 +1,20 @@
 #### Use two appenders, one to log to console, another to log to a file
-log4j.rootCategory=info, R
+log4j.rootCategory=DEBUG, CONSOLE, LOGFILE
 
 ####  appender writes to a file
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=axis.log
+log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
+log4j.appender.LOGFILE.File=axis.log
 
 # Control the maximum log file size
-log4j.appender.R.MaxFileSize=10000KB
+log4j.appender.LOGFILE.MaxFileSize=10000KB
 # Archive log files (one backup file here)
-log4j.appender.R.MaxBackupIndex=100
+log4j.appender.LOGFILE.MaxBackupIndex=100
 
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%6r %5p [%t] (%F:%L) - %m%n
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOGFILE.layout.ConversionPattern=%6r %5p [%t] (%F:%L) - %m%n
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=DEBUG
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n



Mime
View raw message