axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r226772 - in /webservices/axis/trunk/java/modules: common/src/org/apache/axis2/ core/src/org/apache/axis2/ core/src/org/apache/axis2/clientapi/ core/src/org/apache/axis2/deployment/ core/src/org/apache/axis2/phaseresolver/ core/src/org/apac...
Date Mon, 01 Aug 2005 10:50:39 GMT
Author: deepal
Date: Mon Aug  1 03:49:24 2005
New Revision: 226772

URL: http://svn.apache.org/viewcvs?rev=226772&view=rev
Log:
fixing build failing

Modified:
    webservices/axis/trunk/java/modules/common/src/org/apache/axis2/AxisFault.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/Constants.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java

Modified: webservices/axis/trunk/java/modules/common/src/org/apache/axis2/AxisFault.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/common/src/org/apache/axis2/AxisFault.java?rev=226772&r1=226771&r2=226772&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/common/src/org/apache/axis2/AxisFault.java (original)
+++ webservices/axis/trunk/java/modules/common/src/org/apache/axis2/AxisFault.java Mon Aug
 1 03:49:24 2005
@@ -19,7 +19,7 @@
 import java.rmi.RemoteException;
 
 /**
- * An exception which maps cleanly to a Axis Fault.
+ * An exception which maps cleanly to a SOAP fault.
  * This is a base class for exceptions which are mapped to faults.
  * SOAP faults contain
  * <ol>
@@ -29,10 +29,11 @@
  * <li>Fault details; an xml tree of fault specific stuff
  * </ol>
  */
-public class AxisFault extends RemoteException {
+public class AxisFault extends RemoteException implements SOAPFaultException{
 
     private String soapFaultCode;
 
+    
     public AxisFault(Throwable arg1) {
         super(arg1.getMessage(), arg1);
     }
@@ -94,5 +95,13 @@
     public AxisFault(String messageText, String faultCode) {
         super(messageText);
         this.soapFaultCode = faultCode;
+    }
+
+    public String getFaultCode() {
+        return soapFaultCode;
+    }
+
+    public void setFaultCode(String soapFaultCode) {
+        this.soapFaultCode = soapFaultCode;
     }
 }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=226772&r1=226771&r2=226772&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/Constants.java Mon Aug 
1 03:49:24 2005
@@ -187,7 +187,7 @@
 
 
     public static final String TESTING_PATH = "target/test-resources/";
-    //public static final String TESTING_PATH = "modules/samples/target/test-resources/";
+//    public static final String TESTING_PATH = "modules/samples/target/test-resources/";
 
     public static final String TESTING_REPOSITORY = TESTING_PATH + "samples";
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java?rev=226772&r1=226771&r2=226772&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java Mon
Aug  1 03:49:24 2005
@@ -1,20 +1,20 @@
 /*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *  Runtime state of the engine
- */
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*  Runtime state of the engine
+*/
 package org.apache.axis2.clientapi;
 
 import java.util.HashMap;
@@ -30,6 +30,8 @@
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.deployment.util.PhasesInfo;
 
 /**
  * This class is the pretty convineance class for the user without see the comlplexites of
Axis2.
@@ -79,10 +81,10 @@
      */
 
     public OMElement invokeBlocking(String axisop, OMElement toSend)
-        throws AxisFault {
+            throws AxisFault {
 
         OperationDescription opDesc =
-            serviceContext.getServiceConfig().getOperation(new QName(axisop));
+                serviceContext.getServiceConfig().getOperation(new QName(axisop));
         opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop);
         MessageContext msgctx = prepareTheSOAPEnvelope(toSend);
 
@@ -102,12 +104,12 @@
      */
 
     public void invokeNonBlocking(
-        String axisop,
-        OMElement toSend,
-        Callback callback)
-        throws AxisFault {
+            String axisop,
+            OMElement toSend,
+            Callback callback)
+            throws AxisFault {
         OperationDescription opDesc =
-            serviceContext.getServiceConfig().getOperation(new QName(axisop));
+                serviceContext.getServiceConfig().getOperation(new QName(axisop));
         opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop);
         MessageContext msgctx = prepareTheSOAPEnvelope(toSend);
         //call the underline implementation
@@ -121,19 +123,19 @@
      * @return
      */
     private OperationDescription createOpDescAndFillInFlowInformation(
-        OperationDescription opDesc,
-        String axisOp) {
+            OperationDescription opDesc,
+            String axisOp) {
         if (opDesc == null) {
             //if the operation is not alrady define we will copy the 
             //crated Phases from the templete operation to the this Operation
             opDesc = new OperationDescription(new QName(axisOp));
             opDesc.setRemainingPhasesInFlow(
-                operationTemplate.getRemainingPhasesInFlow());
+                    operationTemplate.getRemainingPhasesInFlow());
             opDesc.setPhasesOutFlow(operationTemplate.getPhasesOutFlow());
             opDesc.setPhasesInFaultFlow(
-                operationTemplate.getPhasesInFaultFlow());
+                    operationTemplate.getPhasesInFaultFlow());
             opDesc.setPhasesOutFaultFlow(
-                operationTemplate.getPhasesOutFaultFlow());
+                    operationTemplate.getPhasesOutFaultFlow());
             serviceContext.getServiceConfig().addOperation(opDesc);
         }
         return opDesc;
@@ -146,28 +148,34 @@
      * @throws org.apache.axis2.AxisFault
      */
     protected static ServiceContext assumeServiceContext(String clinetHome)
-        throws AxisFault {
+            throws AxisFault {
         ConfigurationContext sysContext = null;
         //we are trying to keep one configuration Context at the Client side. That make it
easier to
         //manage the TransportListeners. But using the static referance is bit crude!. 
         if (ListenerManager.configurationContext == null) {
             ConfigurationContextFactory efac =
-                new ConfigurationContextFactory();
+                    new ConfigurationContextFactory();
             sysContext = efac.buildClientConfigurationContext(clinetHome);
         } else {
             sysContext = ListenerManager.configurationContext;
         }
 
-        //we will assume a Service and operations  
+        //we will assume a Service and operations
         QName assumedServiceName = new QName("AnonnoymousService");
         ServiceDescription axisService =
-            new ServiceDescription(assumedServiceName);
+                new ServiceDescription(assumedServiceName);
         operationTemplate =
-            new OperationDescription(new QName("TemplateOperatin"));
+                new OperationDescription(new QName("TemplateOperatin"));
+
+        PhasesInfo info =((AxisConfigurationImpl)sysContext.getAxisConfiguration()).getPhasesinfo();
+        //to set the operation flows
+        if(info != null){
+            info.setOperationPhases(operationTemplate);
+        }
         axisService.addOperation(operationTemplate);
         sysContext.getAxisConfiguration().addService(axisService);
         ServiceContext service =
-            sysContext.createServiceContext(assumedServiceName);
+                sysContext.createServiceContext(assumedServiceName);
         return service;
     }
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=226772&r1=226771&r2=226772&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
Mon Aug  1 03:49:24 2005
@@ -254,6 +254,7 @@
             checkClientHome(clientHome);
             isRepositoryExist = true;
             try {
+//                engineConfigName = axis2repository + "/axis2.xml";
                 File tempfile = new File(engineConfigName);
                 in = new FileInputStream(tempfile);
             } catch (FileNotFoundException e) {

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java?rev=226772&r1=226771&r2=226772&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java
Mon Aug  1 03:49:24 2005
@@ -66,7 +66,7 @@
         } else {
             throw new PhaseException(
                     "Invalid Phase ," + phaseName
-                    + "for the handler "
+                    + "  for the handler "
                     + handler.getName()
                     +
                     " dose not exit in axis2.xml or refering to phase in diffrent flow");

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=226772&r1=226771&r2=226772&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
Mon Aug  1 03:49:24 2005
@@ -144,7 +144,7 @@
                 try {
                     this.socket.close();
                 } catch (IOException e1) {
-//                    log.error(e1);
+                    log.error(e1);
                 }
             }
         }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java?rev=226772&r1=226771&r2=226772&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
Mon Aug  1 03:49:24 2005
@@ -126,6 +126,7 @@
                     soapNamespaceURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
 
                 }
+                msgContext.setSoapNamespaceURI(soapNamespaceURI);
                 StAXBuilder builder = new StAXSOAPModelBuilder(reader, soapNamespaceURI);
 
                 SOAPEnvelope envelope = (SOAPEnvelope) builder.getDocumentElement();

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java?rev=226772&r1=226771&r2=226772&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
Mon Aug  1 03:49:24 2005
@@ -110,6 +110,7 @@
                 soapNamespaceURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
 
             }
+            msgContext.setSoapNamespaceURI(soapNamespaceURI);
             StAXBuilder builder = new StAXSOAPModelBuilder(reader, soapNamespaceURI);
 
             SOAPEnvelope envelope = (SOAPEnvelope) builder.getDocumentElement();

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java?rev=226772&r1=226771&r2=226772&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java
(original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java
Mon Aug  1 03:49:24 2005
@@ -46,8 +46,8 @@
 public class FaultHandlingTest extends TestCase {
     private EndpointReference targetEPR =
             new EndpointReference("http://127.0.0.1:"
-//            + (UtilServer.TESTING_PORT)
-            + ("5556")
+            + (UtilServer.TESTING_PORT)
+//            + ("5556")
             + "/axis/services/EchoXMLService/echoOMElement");
     private Log log = LogFactory.getLog(getClass());
     private QName operationName = new QName("echoOMElement");

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java?rev=226772&r1=226771&r2=226772&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java
(original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java
Mon Aug  1 03:49:24 2005
@@ -50,8 +50,8 @@
 
 
     private static final String ADDRESS = "http://127.0.0.1:" +
-            ("5556") +
-//            (UtilServer.TESTING_PORT) +
+//            ("5556") +
+            (UtilServer.TESTING_PORT) +
             "/axis/services/" + SERVICE_NAME + "/" + OPERATION_NAME;
 //    private static final String ADDRESS = "http://127.0.0.1:8080/axis/services/" + SERVICE_NAME;
     private EndpointReference targetEPR = new EndpointReference(ADDRESS);



Mime
View raw message