You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ma...@apache.org on 2008/07/21 11:51:57 UTC
svn commit: r678378 - in /webservices/axis2/branches/c/post_1_4_mtom/c: ./
samples/ src/core/transport/http/receiver/
src/core/transport/http/server/apache2/ src/core/transport/http/util/
xdocs/docs/
Author: manjula
Date: Mon Jul 21 02:51:50 2008
New Revision: 678378
URL: http://svn.apache.org/viewvc?rev=678378&view=rev
Log:
Adding latest changes from the trunk.
Modified:
webservices/axis2/branches/c/post_1_4_mtom/c/ (props changed)
webservices/axis2/branches/c/post_1_4_mtom/c/samples/configure.ac
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/receiver/Makefile.am
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/apache2/mod_axis2.c
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c
webservices/axis2/branches/c/post_1_4_mtom/c/xdocs/docs/axis2c_manual.html
webservices/axis2/branches/c/post_1_4_mtom/c/xdocs/docs/installationguide.html
Propchange: webservices/axis2/branches/c/post_1_4_mtom/c/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul 21 02:51:50 2008
@@ -1 +1 @@
-/webservices/axis2/trunk/c:1-674732
+/webservices/axis2/trunk/c:1-678377
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/samples/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/samples/configure.ac?rev=678378&r1=678377&r2=678378&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/samples/configure.ac (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/samples/configure.ac Mon Jul 21 02:51:50 2008
@@ -85,7 +85,7 @@
[ --with-axis2[=PATH] Find the AXIS2 header files in 'PATH'.
'PATH' should point to AXIS2 include files location.
If you omit the '=PATH' part completely, the configure script will search
- '$(AXIS2C_HOME)/include/axis2-1.4.0' for AXIS2 headers.],
+ '$(AXIS2C_HOME)/include/axis2-1.5.0' for AXIS2 headers.],
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -97,7 +97,7 @@
axis2inc="-I$withval"
dnl else find the axiom include dir in $(AXIS2C_HOME)/include
elif test -d '$(AXIS2C_HOME)/include'; then
- axis2inc="-I$(AXIS2C_HOME)/include/axis2-1.4.0"
+ axis2inc="-I$(AXIS2C_HOME)/include/axis2-1.5.0"
else
AC_MSG_ERROR(could not find axis2. stop)
fi
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/receiver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/receiver/Makefile.am?rev=678378&r1=678377&r2=678378&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/receiver/Makefile.am (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/receiver/Makefile.am Mon Jul 21 02:51:50 2008
@@ -1,6 +1,7 @@
lib_LTLIBRARIES = libaxis2_http_receiver.la
libaxis2_http_receiver_la_LIBADD=$(top_builddir)/util/src/libaxutil.la\
- $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la
+ $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
+ $(top_builddir)/src/core/engine/libaxis2_engine.la
libaxis2_http_receiver_la_SOURCES = http_receiver.c\
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/apache2/mod_axis2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/apache2/mod_axis2.c?rev=678378&r1=678377&r2=678378&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/apache2/mod_axis2.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/server/apache2/mod_axis2.c Mon Jul 21 02:51:50 2008
@@ -713,7 +713,7 @@
exit(APEXIT_CHILDFATAL);
}
/* If we are initialized we register a clean up as well */
- apr_pool_cleanup_register(p, NULL, axis2_shutdown, apr_pool_cleanup_null);
+ /* apr_pool_cleanup_register(p, NULL, axis2_shutdown, apr_pool_cleanup_null);*/
}
static void
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c?rev=678378&r1=678377&r2=678378&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c Mon Jul 21 02:51:50 2008
@@ -2541,8 +2541,6 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_msg_ctx_t *msg_ctx = NULL;
axutil_stream_t *out_stream = NULL;
- axis2_transport_out_desc_t *out_desc = NULL;
- axis2_transport_in_desc_t *in_desc = NULL;
axutil_string_t *soap_action = NULL;
axis2_bool_t processed = AXIS2_FALSE;
axis2_char_t *body_string = NULL;
@@ -2573,12 +2571,8 @@
/** creating the out stream */
out_stream = axutil_stream_create_basic(env);
- /** transport out description */
- out_desc = axis2_conf_get_transport_out(axis2_conf_ctx_get_conf(conf_ctx, env),
- env, AXIS2_TRANSPORT_ENUM_HTTP);
- /** transport in description */
- in_desc = axis2_conf_get_transport_in(axis2_conf_ctx_get_conf(conf_ctx, env),
- env, AXIS2_TRANSPORT_ENUM_HTTP);
+ if(request->transfer_encoding)
+ axis2_msg_ctx_set_transfer_encoding(request->msg_ctx, env, request->transfer_encoding);
axis2_msg_ctx_set_server_side(request->msg_ctx , env, AXIS2_TRUE);
msg_ctx = request->msg_ctx;
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/xdocs/docs/axis2c_manual.html
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/xdocs/docs/axis2c_manual.html?rev=678378&r1=678377&r2=678378&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/xdocs/docs/axis2c_manual.html (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/xdocs/docs/axis2c_manual.html Mon Jul 21 02:51:50 2008
@@ -1471,7 +1471,7 @@
<h3>11.3 Deploying mod_axis2</h3>
<p><font color="#666666">NOTE: To execute some of
the commands given below,
-you might require super user privileges on your machine.</font></p>
+you might require super user privileges on your machine. If you are using the binary release of Axis2/C, please note that it is built with Apache 2.2.</font></p>
<p>Copy the mod_axis2 shared library <font color="#4169e1">(libmod_axis2.so.0.0.0
on Linux and mod_axis2.dll on MS
Windows)</font> to the Apache2 modules directory as mod_axis2.so</p>
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/xdocs/docs/installationguide.html
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/xdocs/docs/installationguide.html?rev=678378&r1=678377&r2=678378&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/xdocs/docs/installationguide.html (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/xdocs/docs/installationguide.html Mon Jul 21 02:51:50 2008
@@ -593,7 +593,7 @@
<div class="subsection"><a name="3.2"></a>
<h3>3.2 Deploying in Apache2 Web Server</h3>
NOTE : To do the following tasks, you might need super user privileges
-on your machine.<br />
+on your machine. If you are using the binary release of Axis2/C, please note that it is built with Apache 2.2.<br />
<br />
Copy the mod_axis2 (libmod_axis2.so.0.3.1 on Linux and mod_axis2.dll on
Windows) to "<apache2 modules directory>" as
@@ -694,19 +694,45 @@
<li>debug - Log debug and above (default)</li>
<li>warning - Log warnings</li>
</ul>
-Using the IIS management console, add a new virtual directory to the
-IIS/PWS web site called "axis2". The physical path of this virtual
-directory should be the axis2\lib directory (Where the
-mod_axis2_IIS.dll is in)<br />
-Assign excecute permissions to this virtual directory.<br />
-<br />
-Using the IIS management console, add mod_axis2_IIS.dll as a filter to
-the IIS/PWS web site. <br />
-The name of the filter can be any meaningful name. <br />
-<br />
-Restart IIS and test whether mod_axis2_IIS module is loaded by typing
-the URL <a href="http://localhost/axis2" class="externalLink">http://localhost/axis2</a>
-in your Web browser.
+<p>
+You can add a string value with the name <code>services_url_prefix</code>. This is optional and defaults to "/services".
+As an example, if you have "/web_services" as the prefix, then all the
+services hosted would have the endpoint prefix of : <br />
+http://localhost/axis2/web_services.<br />Note: don't forget the / at the begining.<br />
+</p>
+<p>
+If you wish, you can also change the location as well by adding a string value with the name <code>axis2_location</code>. This is also optional and defaults to /axis2.
+If you have /myserser as the value you can access your web services with a url like http://localhost/myserver/services. <br/>Note: Don't forget the / at the beginning.</p>
+<p>
+
+<p>Now you can do all the registry editing using the JScript file axis2_iis_regedit.js provided with the distribution.
+When you build axis2/C with the IIS module the file is copied to the root directory of the binary distribution.
+Just double click it and everything will be set to the defaults. The axis2c_home is taken as the current directory, so make sure you run the file in the Axis2/C repository location (or root of the binary distribution). If you want to change the values you can
+manually edit the the .js file or give it as command line arguments to the script when running the script. To run the jscript from the command line use the command <code>:\cscript axis2_iis_regedit.js optional arguments</code>. We recomend the manual editing as it is the easiest way to specify the values.</p>
+<p><b>IIS 5.1 or Below</b></p>
+Using the IIS management console, add a new virtual
+directory to your IIS/PWS web site. The name of the virtual directory
+must be <code>axis2</code>. Its
+physical path should be the directory in which you placed
+mod_axis2_IIS.dll (in our example it is
+c:\axis2c\lib). When creating this new virtual directory, <b>assign
+execute access to it</b>.</p>
+<p>By using the IIS management console, add
+mod_axis2_IIS.dll as a filter in your IIS/PWS web site and restart the
+IIS
+admin service.</p>
+<p><b>IIS 6 & 7</b></p>
+Using the IIS management console, add the mod_axis2_IIS.dll as a
+Wildcard Script Map.
+<ul>
+<li>Executable should be the complete path to the
+mod_axis2_IIS.dll</li>
+<li>You can put any name as the name of the Wildcard Script Map</li>
+</ul>
+<p>Please don't add the mod_axis2_IIS.dll as a filter to IIS as
+in the IIS 5.1 case.</p>
+<p>Note: If the Axis2/C failed to load, verify that Axis2/C and
+its dependent DLLs are in the System Path (not the user path). </p>
</div>
</div>
</div></div></body></html>