svn commit: r1209034 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java

2011-12-01 Thread isurues 
Author: isurues
Date: Thu Dec  1 11:14:59 2011
New Revision: 1209034

URL: http://svn.apache.org/viewvc?rev=1209034&view=rev
Log:
Removing unwanted methods after properly fixing AXIS2-4930

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?rev=1209034&r1=1209033&r2=1209034&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
 Thu Dec  1 11:14:59 2011
@@ -83,11 +83,11 @@ public class JAXWSMessageReceiver implem
 // inside of the services.xml.
 AxisService service = axisRequestMsgCtx.getAxisService();
 
-// we need to merge the deployment class loader to the TCCL. This is 
because, in JAX-WS
+// we need to set the deployment class loader as the TCCL. This is 
because, in JAX-WS
 // services, there can be situations where we have to load classes 
from the deployment
 // artifact (JAX-WS jar file) in the message flow. Ex: Handler classes 
in the service
 // artifact. Adding this as a fix for AXIS2-4930.
-mergeDeploymentCL(service);
+setContextClassLoader(service.getClassLoader());
 
 org.apache.axis2.description.Parameter svcClassParam =
 service.getParameter(PARAM_SERVICE_CLASS);
@@ -259,41 +259,6 @@ public class JAXWSMessageReceiver implem
 }
 
 /**
- * Merges the deployment class loader to the TCCL. Deployment class loader 
is accessed through
- * the AxisService and a new class loader is created by using URLs from 
deployment class loder
- * and setting the current TCCL as the parent. Finally the new class 
loader is set as the TCCL.
- *
- * @param service - Current AxisService instance
- */
-private void mergeDeploymentCL(AxisService service) {
-setContextClassLoader(service.getClassLoader());
-//TODO - need to remove
-//ClassLoader deploymentClassLoader = service.getClassLoader();
-//if (deploymentClassLoader instanceof URLClassLoader) {
-//// get URLs from deployment class loader
-//URL[] deploymentClassLoaderUrls = ((URLClassLoader) 
deploymentClassLoader).getURLs();
-//// create a new class loader by setting the current TCCL as the 
parent
-//setContextClassLoader(new 
URLClassLoader(deploymentClassLoaderUrls,
-//getContextClassLoader()));
-//}
-}
-
-/**
- * Get context class loader of the current thread.
- *
- * @return ClassLoader
- */
-private ClassLoader getContextClassLoader() {
-return (ClassLoader) AccessController.doPrivileged(
-new PrivilegedAction() {
-public Object run() {
-return Thread.currentThread().getContextClassLoader();
-}
-}
-);
-}
-
-/**
  * Set context class loader of the current thread.
  *
  * @param cl the context ClassLoader for the Thread

svn commit: r1209205 - in /axis/axis2/java/core/branches/1_6: ./ modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java

2011-12-01 Thread sagara 
Author: sagara
Date: Thu Dec  1 19:37:33 2011
New Revision: 1209205

URL: http://svn.apache.org/viewvc?rev=1209205&view=rev
Log:
Merged 1208901,1209034 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  1 19:37:33 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,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939
+/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,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

Modified: 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?rev=1209205&r1=1209204&r2=1209205&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
 Thu Dec  1 19:37:33 2011
@@ -52,8 +52,6 @@ import org.apache.commons.logging.LogFac
 
 import javax.xml.ws.Binding;
 import javax.xml.ws.WebServiceException;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.security.PrivilegedAction;
 
 /**
@@ -85,11 +83,11 @@ public class JAXWSMessageReceiver implem
 // inside of the services.xml.
 AxisService service = axisRequestMsgCtx.getAxisService();
 
-// we need to merge the deployment class loader to the TCCL. This is 
because, in JAX-WS
+// we need to set the deployment class loader as the TCCL. This is 
because, in JAX-WS
 // services, there can be situations where we have to load classes 
from the deployment
 // artifact (JAX-WS jar file) in the message flow. Ex: Handler classes 
in the service
 // artifact. Adding this as a fix for AXIS2-4930.
-mergeDeploymentCL(service);
+setContextClassLoader(service.getClassLoader());
 
 org.apache.axis2.description.Parameter svcClassParam =
 service.getParameter(PARAM_SERVICE_CLASS);
@@ -261,39 +259,6 @@ public class JAXWSMessageReceiver implem
 }
 
 /**
- * Merges the deployment class loader to the TCCL. Deployment class loader 
is accessed through
- * the AxisService and a new class loader is created by using URLs from 
deployment class loder
- * and setting the current TCCL as the parent. Finally the new class 
loader is set as the TCCL.
- *
- * @param service - Current AxisService instance
- */
-private void mergeDeploymentCL(AxisService service) {
-ClassLoader deploymentClassLoader = service.getClassLoader();
-if (deploymentClassLoader instanceof URLClassLoader) {
-// get URLs from deployment class loader
-URL[] deploymentClassLoaderUrls = ((URLClassLoader) 
deploymentClass