ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r386009 - in /webservices/axis2/trunk/c: configure.ac include/axis2_error.h include/axis2_wsdl.h modules/core/transport/http/server/simple_axis2_server/Makefile.am modules/util/error.c modules/wsdl/builder/wsdl11_mep_finder.c
Date Wed, 15 Mar 2006 09:21:20 GMT
Author: damitha
Date: Wed Mar 15 01:21:17 2006
New Revision: 386009

URL: http://svn.apache.org/viewcvs?rev=386009&view=rev
Log: (empty)

Modified:
    webservices/axis2/trunk/c/configure.ac
    webservices/axis2/trunk/c/include/axis2_error.h
    webservices/axis2/trunk/c/include/axis2_wsdl.h
    webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
    webservices/axis2/trunk/c/modules/util/error.c
    webservices/axis2/trunk/c/modules/wsdl/builder/wsdl11_mep_finder.c

Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=386009&r1=386008&r2=386009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed Mar 15 01:21:17 2006
@@ -233,6 +233,7 @@
     modules/util/Makefile \
     modules/platforms/unix/Makefile \
     modules/wsdl/Makefile \
+    modules/wsdl/builder/Makefile \
     modules/mod_addr/Makefile \
     samples/Makefile \
     samples/server/Makefile \

Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=386009&r1=386008&r2=386009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Wed Mar 15 01:21:17 2006
@@ -24,79 +24,6 @@
 extern "C"
 {
 #endif
-
-    struct axis2_error;
-    struct axis2_error_ops;
-	typedef enum axis2_status_codes axis2_status_codes_t;
-	typedef enum axis2_error_codes axis2_error_codes_t;
-
-/**
- * @defgroup axis2_error Error
- * @ingroup axis2_util 
- * @{
- */
-
-  /** 
-    * \brief Axis2 error ops struct
-    *
-    * Encapsulator struct for ops of axis2_error
-    */
-   AXIS2_DECLARE_DATA typedef struct axis2_error_ops
-    {
-
-      /**
-        * deallocate memory of a error struct
-        * @return axis2_status_t status code
-        */
-
-        axis2_status_t (AXIS2_CALL *free)(struct axis2_error *error);
-        
-      /**
-        * get error message for the last error
-        * @return error message for the last error. NULL on error.
-        */
-         axis2_char_t * (AXIS2_CALL *get_message) (struct axis2_error *error);
-		
-		 axis2_status_t  (AXIS2_CALL *set_error_number) (struct axis2_error *error
-				,  axis2_error_codes_t error_number);
-		
-         axis2_status_t  (AXIS2_CALL *set_status_code) (struct axis2_error *error
-				, axis2_status_codes_t status_code);
-		
-         axis2_status_t  (AXIS2_CALL *get_status_code) (struct axis2_error *error);
-			 
-    } axis2_error_ops_t;
-
-  /** 
-    * \brief Axis2 Error struct
-    *
-    * Error holds the last errorno
-    */
-    typedef struct axis2_error
-    {
-        /** error related ops */
-        struct axis2_error_ops *ops;
-        /** last error number */
-        int error_number;
-
-        int status_code;
-    } axis2_error_t;
-
-AXIS2_DECLARE(axis2_status_t) axis2_error_init();
-
-#define AXIS2_ERROR_FREE(error) ((error->ops)->free(error))
-
-#define AXIS2_ERROR_GET_MESSAGE(error) \
-    ((error)->ops->get_message(error))
-
-#define AXIS2_ERROR_SET_ERROR_NUMBER(error, error_number) \
-        ((error)->ops->set_error_number(error, error_number))
-	
-#define AXIS2_ERROR_SET_STATUS_CODE(error, status_code) \
-        ((error)->ops->set_status_code(error, status_code))
-        
-#define AXIS2_ERROR_GET_STATUS_CODE(error) ((error)->ops->get_status_code(error))
-
   /** 
     * \brief Axis2 status codes
     *
@@ -111,7 +38,6 @@
         /** Success state */
         AXIS2_SUCCESS
     };
-
   /** 
     * \brief Axis2 error codes
     *
@@ -287,6 +213,8 @@
         AXIS2_ERROR_MEP_CANNOT_BE_NULL_IN_MEP_CLIENT,
         /* MEP Mismatch */
         AXIS2_ERROR_MEP_MISMATCH_IN_MEP_CLIENT,
+        /* Cannot determine MEP */
+        AXIS2_ERROR_MEP_CANNOT_DETERMINE_MEP,
         /** cannot infer transport from URL */
         AXIS2_ERROR_CANNOT_INFER_TRANSPORT,
         /** Invalid SOAP version */
@@ -347,8 +275,6 @@
         AXIS2_ERROR_SERVICE_XML_NOT_FOUND,
         /** Module xml file is not found in the given path */
         AXIS2_ERROR_MODULE_XML_NOT_FOUND_FOR_THE_MODULE,
-        /** Content-Type header missing in HTTP response */
-        AXIS2_ERROR_RESPONSE_CONTENT_TYPE_MISSING,
         
         AXIS2_ERROR_OPERATION_NAME_MISSING,
         
@@ -411,7 +337,6 @@
         AXIS2_ERROR_SOAP_FAULT_SUB_CODE_DOES_NOT_HAVE_A_VALUE,
         
         AXIS2_ERROR_MULTIPLE_NODE_ELEMENTS_ENCOUNTERED,
-        
         AXIS2_ERROR_SOAP_FAULT_REASON_ELEMENT_SHOULD_HAVE_A_TEXT,
         
         AXIS2_ERROR_MULTIPLE_ROLE_ELEMENTS_ENCOUNTERED,
@@ -484,6 +409,14 @@
         AXIS2_ERROR_FLOW_TYPE_CANNOT_BE_NULL,
         /* Data element of the OM Node is null */
         AXIS2_ERROR_DATA_ELEMENT_IS_NULL,
+        /* Wsdl binding name cannot be NULL(Is required) */
+        AXIS2_ERROR_WSDL_BINDING_NAME_IS_REQUIRED,
+        /* PortType/Interface name cannot be null(Required) */
+        AXIS2_ERROR_WSDL_INTERFACE_NAME_IS_REQUIRED,
+        /* Wsdl svc name cannot be null(Required) */
+        AXIS2_ERROR_WSDL_SVC_NAME_IS_REQUIRED,
+        /*Content-Type header missing in HTTP response" */
+        AXIS2_ERROR_RESPONSE_CONTENT_TYPE_MISSING,
 
         /** The following has to be the last error value all the time.
             All other error codes should appear above this.
@@ -492,6 +425,80 @@
           */
         AXIS2_ERROR_LAST
     };
+        
+    struct axis2_error;
+    struct axis2_error_ops;
+	typedef enum axis2_status_codes axis2_status_codes_t;
+	typedef enum axis2_error_codes axis2_error_codes_t;
+
+/**
+ * @defgroup axis2_error Error
+ * @ingroup axis2_util 
+ * @{
+ */
+
+  /** 
+    * \brief Axis2 error ops struct
+    *
+    * Encapsulator struct for ops of axis2_error
+    */
+   AXIS2_DECLARE_DATA typedef struct axis2_error_ops
+    {
+
+      /**
+        * deallocate memory of a error struct
+        * @return axis2_status_t status code
+        */
+
+        axis2_status_t (AXIS2_CALL *free)(struct axis2_error *error);
+        
+      /**
+        * get error message for the last error
+        * @return error message for the last error. NULL on error.
+        */
+         axis2_char_t * (AXIS2_CALL *get_message) (struct axis2_error *error);
+		
+		 axis2_status_t  (AXIS2_CALL *set_error_number) (struct axis2_error *error
+				,  axis2_error_codes_t error_number);
+		
+         axis2_status_t  (AXIS2_CALL *set_status_code) (struct axis2_error *error
+				, axis2_status_codes_t status_code);
+		
+         axis2_status_t  (AXIS2_CALL *get_status_code) (struct axis2_error *error);
+			 
+    } axis2_error_ops_t;
+
+  /** 
+    * \brief Axis2 Error struct
+    *
+    * Error holds the last errorno
+    */
+    typedef struct axis2_error
+    {
+        /** error related ops */
+        struct axis2_error_ops *ops;
+        /** last error number */
+        int error_number;
+
+        int status_code;
+    } axis2_error_t;
+
+AXIS2_DECLARE(axis2_status_t) axis2_error_init();
+
+#define AXIS2_ERROR_FREE(error) ((error->ops)->free(error))
+
+#define AXIS2_ERROR_GET_MESSAGE(error) \
+    ((error)->ops->get_message(error))
+
+#define AXIS2_ERROR_SET_ERROR_NUMBER(error, error_number) \
+        ((error)->ops->set_error_number(error, error_number))
+	
+#define AXIS2_ERROR_SET_STATUS_CODE(error, status_code) \
+        ((error)->ops->set_status_code(error, status_code))
+        
+#define AXIS2_ERROR_GET_STATUS_CODE(error) ((error)->ops->get_status_code(error))
+
+
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/include/axis2_wsdl.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl.h?rev=386009&r1=386008&r2=386009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl.h Wed Mar 15 01:21:17 2006
@@ -52,6 +52,8 @@
  */
 #define AXIS2_WSDL_MESSAGE_DIRECTION_OUT "out"
 
+#define AXIS2_WSDL_1_1  1
+#define AXIS2_WSDL_2_0  2
 
 /*********************Message Exchange Pattern Constants***********************/
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am?rev=386009&r1=386008&r2=386009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
(original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
Wed Mar 15 01:21:17 2006
@@ -6,6 +6,15 @@
 axis2_http_server_SOURCES = http_server_main.c
 
 axis2_http_server_LDADD   =  $(LDFLAGS) \
+                            -L$(top_builddir)/modules/util \
+                            -L$(top_builddir)/modules/wsdl \
+                            -L$(top_builddir)/modules/core/engine \
+                            -L$(top_builddir)/modules/core/transport/http/sender \
+                            -L$(top_builddir)/modules/core/transport/http/receiver \
+                            -L$(top_builddir)/modules/xml/om \
+                            -L$(top_builddir)/modules/xml/parser/libxml2 \
+                            -L$(top_builddir)/modules/xml/soap \
+                            -L$(top_builddir)/modules/platforms/unix \
                             -laxis2_om \
                             -laxis2_engine \
                             -laxis2_soap \
@@ -16,15 +25,6 @@
                             -laxis2_http_receiver \
                             -lxml2 \
                             -laxis2_unix\
-                            -L$(top_builddir)/modules/util \
-                            -L$(top_builddir)/modules/wsdl \
-                            -L$(top_builddir)/modules/core/engine \
-                            -L$(top_builddir)/modules/core/transport/http/sender \
-                            -L$(top_builddir)/modules/core/transport/http/receiver \
-                            -L$(top_builddir)/modules/xml/om \
-                            -L$(top_builddir)/modules/xml/parser/libxml2 \
-                            -L$(top_builddir)/modules/xml/soap \
-                            -L$(top_builddir)/modules/platforms/unix \
                             $(LIBXML2_LIBS) \
                             $(GUTHTHILA_LIBS)
                     

Modified: webservices/axis2/trunk/c/modules/util/error.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/error.c?rev=386009&r1=386008&r2=386009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/error.c (original)
+++ webservices/axis2/trunk/c/modules/util/error.c Wed Mar 15 01:21:17 2006
@@ -204,6 +204,8 @@
         "MEP cannot be NULL in MEP client";
     axis2_error_messages[AXIS2_ERROR_MEP_MISMATCH_IN_MEP_CLIENT] = 
         "MEP Mismatch";
+    axis2_error_messages[AXIS2_ERROR_MEP_CANNOT_DETERMINE_MEP] = 
+        "Cannot determine MEP";
     axis2_error_messages[AXIS2_ERROR_CANNOT_INFER_TRANSPORT] = 
         "cannot infer transport from URL";
     axis2_error_messages[AXIS2_ERROR_INVALID_SOAP_VERSION] = 
@@ -411,6 +413,12 @@
         "Flow type of PhaseOrder element cannot be null";
     axis2_error_messages[AXIS2_ERROR_DATA_ELEMENT_IS_NULL] =
         "Data element of the OM Node is null";
+    axis2_error_messages[AXIS2_ERROR_WSDL_BINDING_NAME_IS_REQUIRED] =
+        "Wsdl binding name is cannot be NULL(Is required)";
+    axis2_error_messages[AXIS2_ERROR_WSDL_INTERFACE_NAME_IS_REQUIRED] = 
+        " PortType/Interface name cannot be null(Required)";
+    axis2_error_messages[AXIS2_ERROR_WSDL_SVC_NAME_IS_REQUIRED] = 
+        " Wsdl svc name cannot be null(Required)";
     axis2_error_messages[AXIS2_ERROR_RESPONSE_CONTENT_TYPE_MISSING] =
     "Content-Type header missing in HTTP response";
 

Modified: webservices/axis2/trunk/c/modules/wsdl/builder/wsdl11_mep_finder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/builder/wsdl11_mep_finder.c?rev=386009&r1=386008&r2=386009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/builder/wsdl11_mep_finder.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/builder/wsdl11_mep_finder.c Wed Mar 15 01:21:17
2006
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <axis2_wom_builder_internals.h>
-
 axis2_char_t *AXIS2_CALL
 axis2_wom_builder_wsdl11_mep_finder_get_mep(wsdlOperation operation) 
 {



Mime
View raw message