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 2015/09/13 01:10:01 UTC
svn commit: r1702685 - in /axis/axis2/java/core/branches/1_6: ./
modules/kernel/src/org/apache/axis2/deployment/
modules/kernel/src/org/apache/axis2/deployment/util/
Author: veithen
Date: Sat Sep 12 23:10:01 2015
New Revision: 1702685
URL: http://svn.apache.org/r1702685
Log:
AXIS2-5720: Merge r1702667 and r1702678 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 12 23:10:01 2015
@@ -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,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,1683827,168383
1,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1693147,1693802,1693808,1694745,1697181,1697205,1697514,1701352,1701354
+/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,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,1683827,168383
1,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1693147,1693802,1693808,1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678
Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=1702685&r1=1702684&r2=1702685&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Sat Sep 12 23:10:01 2015
@@ -1028,11 +1028,13 @@ public abstract class DeploymentEngine i
* @throws DeploymentException if there's a problem
*/
protected void setClassLoaders(String axis2repoURI) throws DeploymentException {
- ClassLoader sysClassLoader =
- Utils.getClassLoader(Thread.currentThread().getContextClassLoader(), axis2repoURI,
- axisConfig.isChildFirstClassLoading());
-
- axisConfig.setSystemClassLoader(sysClassLoader);
+ if (axisConfig.getSystemClassLoader() == null) {
+ ClassLoader sysClassLoader =
+ Utils.getClassLoader(Thread.currentThread().getContextClassLoader(), axis2repoURI,
+ axisConfig.isChildFirstClassLoading());
+
+ axisConfig.setSystemClassLoader(sysClassLoader);
+ }
if (servicesDir.exists()) {
axisConfig.setServiceClassLoader(
Utils.getClassLoader(axisConfig.getSystemClassLoader(), servicesDir,
Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?rev=1702685&r1=1702684&r2=1702685&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Sat Sep 12 23:10:01 2015
@@ -225,6 +225,10 @@ public class WarBasedAxisConfigurator ex
}
}
if (repository != null) {
+ // WEB-INF contains a lib folder, but we don't want to create a class loader that
+ // attempts to load libraries from there (in particular with parent last as class
+ // loading policy).
+ axisConfig.setSystemClassLoader(Thread.currentThread().getContextClassLoader());
loadRepository(repository);
log.debug("loaded repository from /WEB-INF folder (unpacked war)");
}
@@ -234,6 +238,7 @@ public class WarBasedAxisConfigurator ex
URL url = config.getServletContext().getResource("/WEB-INF/");
if (url != null) {
repository = url.toString();
+ axisConfig.setSystemClassLoader(Thread.currentThread().getContextClassLoader());
loadRepositoryFromURL(url);
log.debug("loaded repository from /WEB-INF/ folder (URL)");
}
Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=1702685&r1=1702684&r2=1702685&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Sat Sep 12 23:10:01 2015
@@ -344,6 +344,9 @@ public class Utils {
for (int i = 0; i < urls.size(); i++) {
urllist[i] = (URL)urls.get(i);
}
+ if (log.isDebugEnabled()) {
+ log.debug("Creating class loader with the following libraries: " + Arrays.asList(urllist));
+ }
classLoader = (URLClassLoader)AccessController
.doPrivileged(new PrivilegedAction() {
public Object run() {