You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/05/06 21:27:51 UTC
svn commit: r1794177 - in /axis/axis2/java/core/trunk/modules:
jaxws/src/org/apache/axis2/jaxws/framework/
kernel/src/org/apache/axis2/deployment/
kernel/src/org/apache/axis2/deployment/repository/util/
kernel/src/org/apache/axis2/deployment/util/
Author: veithen
Date: Sat May 6 21:27:51 2017
New Revision: 1794177
URL: http://svn.apache.org/viewvc?rev=1794177&view=rev
Log:
AXIS2-3919: Remove the extractJars argument from createClassLoader; it's always set to true.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1794177&r1=1794176&r2=1794177&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java Sat May 6 21:27:51 2017
@@ -86,7 +86,6 @@ public class JAXWSDeployer extends Abstr
ClassLoader classLoader = Utils.createClassLoader(
urls,
axisConfig.getSystemClassLoader(),
- true,
(File) axisConfig.
getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
axisConfig.isChildFirstClassLoading());
@@ -145,7 +144,6 @@ public class JAXWSDeployer extends Abstr
ClassLoader classLoader = Utils.createClassLoader(
urls,
axisConfig.getSystemClassLoader(),
- true,
(File) axisConfig.
getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
axisConfig.isChildFirstClassLoading());
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java?rev=1794177&r1=1794176&r2=1794177&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java Sat May 6 21:27:51 2017
@@ -198,7 +198,7 @@ public class ModuleDeployer extends Abst
try {
ClassLoader deploymentClassLoader = Utils.createClassLoader(new URL[] { fileUrl },
- axisConfig.getModuleClassLoader(), true,
+ axisConfig.getModuleClassLoader(),
(File) axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
axisConfig.isChildFirstClassLoading());
AxisModule module = new AxisModule();
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?rev=1794177&r1=1794176&r2=1794177&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java Sat May 6 21:27:51 2017
@@ -115,7 +115,6 @@ public class POJODeployer extends Abstra
ClassLoader classLoader = Utils.createClassLoader(
urls,
configCtx.getAxisConfiguration().getSystemClassLoader(),
- true,
(File)configCtx.getAxisConfiguration().
getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
configCtx.getAxisConfiguration().isChildFirstClassLoading());
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?rev=1794177&r1=1794176&r2=1794177&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java Sat May 6 21:27:51 2017
@@ -300,7 +300,7 @@ public class ServiceDeployer extends Abs
serviceGroup.setServiceGroupName(serviceName);
ClassLoader serviceClassLoader = Utils
.createClassLoader(new URL[] { servicesURL }, axisConfig
- .getServiceClassLoader(), true, (File) axisConfig
+ .getServiceClassLoader(), (File) axisConfig
.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
axisConfig.isChildFirstClassLoading());
String metainf = "meta-inf";
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java?rev=1794177&r1=1794176&r2=1794177&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java Sat May 6 21:27:51 2017
@@ -124,7 +124,7 @@ public class DeploymentFileData {
this.file.getAbsolutePath()));
}
urlsToLoadFrom = new URL[]{this.file.toURI().toURL()};
- classLoader = Utils.createClassLoader(urlsToLoadFrom, parent, true, file, isChildFirstClassLoading);
+ classLoader = Utils.createClassLoader(urlsToLoadFrom, parent, file, isChildFirstClassLoading);
} catch (Exception e) {
throw AxisFault.makeFault(e);
}
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=1794177&r1=1794176&r2=1794177&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Sat May 6 21:27:51 2017
@@ -777,25 +777,22 @@ public class Utils {
public static ClassLoader createClassLoader(ArrayList<URL> urls,
ClassLoader serviceClassLoader,
- boolean extractJars,
File tmpDir,
boolean isChildFirstClassLoading) {
URL url = urls.get(0);
- if (extractJars) {
- try {
- URL[] urls1 = Utils.getURLsForAllJars(url, tmpDir);
- urls.remove(0);
- urls.addAll(0, Arrays.asList(urls1));
- URL[] urls2 = urls.toArray(new URL[urls.size()]);
- return createDeploymentClassLoader(urls2, serviceClassLoader,
- null, isChildFirstClassLoading);
- } catch (Exception e) {
- log
- .warn("Exception extracting jars into temporary directory : "
- + e.getMessage()
- + " : switching to alternate class loading mechanism");
- log.debug(e.getMessage(), e);
- }
+ try {
+ URL[] urls1 = Utils.getURLsForAllJars(url, tmpDir);
+ urls.remove(0);
+ urls.addAll(0, Arrays.asList(urls1));
+ URL[] urls2 = urls.toArray(new URL[urls.size()]);
+ return createDeploymentClassLoader(urls2, serviceClassLoader,
+ null, isChildFirstClassLoading);
+ } catch (Exception e) {
+ log
+ .warn("Exception extracting jars into temporary directory : "
+ + e.getMessage()
+ + " : switching to alternate class loading mechanism");
+ log.debug(e.getMessage(), e);
}
List<String> embedded_jars = Utils.findLibJars(url);
URL[] urls2 = urls.toArray(new URL[urls.size()]);
@@ -810,21 +807,18 @@ public class Utils {
public static ClassLoader createClassLoader(URL[] urls,
ClassLoader serviceClassLoader,
- boolean extractJars,
File tmpDir,
boolean isChildFirstClassLoading) {
- if (extractJars) {
- try {
- URL[] urls1 = Utils.getURLsForAllJars(urls[0], tmpDir);
- return createDeploymentClassLoader(urls1, serviceClassLoader,
- null, isChildFirstClassLoading);
- } catch (Exception e) {
- log
- .warn("Exception extracting jars into temporary directory : "
- + e.getMessage()
- + " : switching to alternate class loading mechanism");
- log.debug(e.getMessage(), e);
- }
+ try {
+ URL[] urls1 = Utils.getURLsForAllJars(urls[0], tmpDir);
+ return createDeploymentClassLoader(urls1, serviceClassLoader,
+ null, isChildFirstClassLoading);
+ } catch (Exception e) {
+ log
+ .warn("Exception extracting jars into temporary directory : "
+ + e.getMessage()
+ + " : switching to alternate class loading mechanism");
+ log.debug(e.getMessage(), e);
}
List<String> embedded_jars = Utils.findLibJars(urls[0]);
return createDeploymentClassLoader(urls, serviceClassLoader,