Author: sagara
Date: Mon Feb 6 15:07:20 2012
New Revision: 1241037
URL: http://svn.apache.org/viewvc?rev=1241037&view=rev
Log:
Merged r1241031 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 6 15:07:20 2012
@@ -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,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470
+/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,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=1241037&r1=1241036&r2=1241037&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
Mon Feb 6 15:07:20 2012
@@ -116,7 +116,12 @@ public class HTTPWorker implements Worke
}
}
if (uri.endsWith("?wsdl2")) {
- String serviceName = uri.substring(uri.lastIndexOf("/") + 1,
uri.length() - 6);
+ /**
+ * service name can be hierarchical
(axis2/services/foo/1.0.0/Version?wsdl2) or
+ * normal (axis2/services/Version?wsdl2).
+ */
+ String[] temp = uri.split(contextPath);
+ String serviceName = temp[1].substring(0, temp[1].length() -
6);
HashMap services =
configurationContext.getAxisConfiguration().getServices();
AxisService service = (AxisService) services.get(serviceName);
if (service != null) {
@@ -136,7 +141,7 @@ public class HTTPWorker implements Worke
* service name can be hierarchical
(axis2/services/foo/1.0.0/Version?wsdl) or
* normal (axis2/services/Version?wsdl).
*/
- String[] temp =
uri.split(configurationContext.getServiceContextPath() + "/");
+ String[] temp = uri.split(contextPath);
String serviceName = temp[1].substring(0, temp[1].length() -
5);
HashMap services =
configurationContext.getAxisConfiguration().getServices();
@@ -154,7 +159,12 @@ public class HTTPWorker implements Worke
}
}
if (uri.endsWith("?xsd")) {
- String serviceName = uri.substring(uri.lastIndexOf("/") + 1,
uri.length() - 4);
+ /**
+ * service name can be hierarchical
(axis2/services/foo/bar/Version) or
+ * normal (axis2/services/Version).
+ */
+ String[] temp = uri.split(contextPath);
+ String serviceName = temp[1].substring(0, temp[1].length() -
4);
HashMap services =
configurationContext.getAxisConfiguration().getServices();
AxisService service = (AxisService) services.get(serviceName);
if (service != null) {
@@ -173,8 +183,9 @@ public class HTTPWorker implements Worke
if (uri.indexOf("?xsd=") > 0) {
// fix for imported schemas
String[] uriParts = uri.split("[?]xsd=");
- String serviceName =
- uri.substring(uriParts[0].lastIndexOf("/") + 1,
uriParts[0].length());
+ // fix for hierarchical service names
+ String[] temp = uriParts[0].split(contextPath);
+ String serviceName = temp[1];
String schemaName = uri.substring(uri.lastIndexOf("=") + 1);
HashMap services =
configurationContext.getAxisConfiguration().getServices();
