Author: sagara
Date: Wed Sep 7 08:23:21 2011
New Revision: 1166049
URL: http://svn.apache.org/viewvc?rev=1166049&view=rev
Log:
Merged r1166040 and r1166038 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/src/site/xdoc/docs/axis2config.xml
axis/axis2/java/core/branches/1_6/src/site/xdoc/docs/userguide-codelisting7.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 7 08:23:21 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040
Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/docs/axis2config.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/docs/axis2config.xml?rev=1166049&r1=1166048&r2=1166049&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/src/site/xdoc/docs/axis2config.xml
(original)
+++ axis/axis2/java/core/branches/1_6/src/site/xdoc/docs/axis2config.xml Wed
Sep 7 08:23:21 2011
@@ -52,9 +52,10 @@ configuration). This document explains t
<p>All the configurations that require starting Axis2 are obtained from
axis2.xml. The way to specify them is extremely simple and easy. The document
-is all about the proper way of specifying the configurations in axis2.xml.
-There are six top level elements that can be seen in the configuration file
-and can be listed as follows:</p>
+is all about the proper way of specifying the configurations in axis2.xml,
which
+is located at AXIS2_HOME/conf. There are six top level elements that
+can be seen in the configuration file inside the root element,
+<axisconfig name="AxisJava2.0"> and can be listed as follows:</p>
<ul>
<li><a href="#Parameter">Parameter</a></li>
<li><a href="#Receiver">Transport Receiver</a></li>
@@ -298,7 +299,9 @@ AxisObserver interface, and the class ha
<p><font>The description of services are specified using services.xml. Each
service archive file needs to have a services.xml in order to be a valid
service and it should be available in the META-INF directory of the archive
-file. A very simple services.xml is shown below:</font></p>
+file(aar) which should be located in AXIS2_HOME/repository/services in
+standalone use. In war distribution this will be axis2/WEB-INF/services
+inside the servlet container. A very simple services.xml is shown
below:</font></p>
<pre><service name="name of the service" scope="name of the scope"
class="full qualifide name the service lifecycle class"
targetNamespace="target namespase for the service">
<Description> The description of the service </Description>
@@ -383,7 +386,9 @@ default message receiver will perform th
<p>The description of the module is specified using the module.xml. Each
module archive file needs to have a module.xml in order to be a valid module,
-and it should be available in the META-INF directory of the archive file. <br/>
+and it should be available in the META-INF directory of the archive file(mar)
+which should be located in AXIS2_HOME/repository/modules in standalone use.
+In war distribution this will be axis2/WEB-INF/modules inside the servlet
container.<br/>
</p>
<p>A very simple module.xml is shown below:</p>
Modified:
axis/axis2/java/core/branches/1_6/src/site/xdoc/docs/userguide-codelisting7.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/docs/userguide-codelisting7.xml?rev=1166049&r1=1166048&r2=1166049&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/src/site/xdoc/docs/userguide-codelisting7.xml
(original)
+++
axis/axis2/java/core/branches/1_6/src/site/xdoc/docs/userguide-codelisting7.xml
Wed Sep 7 08:23:21 2011
@@ -67,7 +67,7 @@ public class Client{
req.setMessageString("An in only request");
- stub.DoInOnly(req);
+ stub.doInOnly(req);
System.out.println("done");
} catch(Exception e){
e.printStackTrace();
@@ -83,7 +83,7 @@ public class Client{
req.setEchoString("echo! ... echo!");
TwoWayOneParameterEchoResponse res =
- stub.TwoWayOneParameterEcho(req);
+ stub.twoWayOneParameterEcho(req);
System.out.println(res.getEchoString());
} catch(Exception e){
@@ -97,7 +97,7 @@ public class Client{
try{
NoParametersRequest req = new NoParametersRequest();
- System.out.println(stub.NoParameters(req));
+ System.out.println(stub.noParameters(req));
} catch(Exception e){
e.printStackTrace();
System.out.println("\n\n\n");
@@ -116,7 +116,7 @@ public class Client{
req.setItemName("flour");
MultipleParametersAddItemResponse res =
- stub.MultipleParametersAddItem(req);
+ stub.multipleParametersAddItem(req);
System.out.println(res.getSuccessfulAdd());
System.out.println(res.getItemId());
