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 2010/12/28 21:29:13 UTC
svn commit: r1053425 - in /axis/axis2/java/core/branches/1_5: ./
modules/distribution/ modules/jaxws/src/org/apache/axis2/jaxws/framework/
modules/kernel/conf/ modules/kernel/src/org/apache/axis2/
modules/kernel/src/org/apache/axis2/deployment/ modules...
Author: veithen
Date: Tue Dec 28 20:29:12 2010
New Revision: 1053425
URL: http://svn.apache.org/viewvc?rev=1053425&view=rev
Log:
Merged the changes for AXIS2-4349 (r776555 and r776612) to the 1.5 branch. This will help us to provide better WebSphere support.
Modified:
axis/axis2/java/core/branches/1_5/ (props changed)
axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed)
axis/axis2/java/core/branches/1_5/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
axis/axis2/java/core/branches/1_5/modules/kernel/conf/axis2.xml
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/Constants.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/TransportDeployer.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed)
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed)
axis/axis2/java/core/branches/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/ (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/ (props changed)
axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/ (props changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props changed)
axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed)
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed)
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed)
Propchange: axis/axis2/java/core/branches/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk:922914,922941,922983,935169,935174,935338,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1
033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/distribution:922914,922941,922983,935169,935174,935338,936434,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,10324
01,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/distribution:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/distribution:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
Modified: axis/axis2/java/core/branches/1_5/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java Tue Dec 28 20:29:12 2010
@@ -102,7 +102,8 @@ public class JAXWSDeployer implements De
axisConfig.getSystemClassLoader(),
true,
(File) axisConfig.
- getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
+ axisConfig.isChildFirstClassLoading());
Thread.currentThread().setContextClassLoader(classLoader);
deployClasses("JAXWS-Builtin", file.toURL(), Thread.currentThread().getContextClassLoader(), classList);
} catch (Exception e) {
@@ -151,7 +152,8 @@ public class JAXWSDeployer implements De
axisConfig.getSystemClassLoader(),
true,
(File) axisConfig.
- getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
+ axisConfig.isChildFirstClassLoading());
Thread.currentThread().setContextClassLoader(classLoader);
ArrayList classList = getListOfClasses(deploymentFileData);
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/conf/axis2.xml?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/conf/axis2.xml (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/conf/axis2.xml Tue Dec 28 20:29:12 2010
@@ -26,6 +26,9 @@
<parameter name="enableMTOM">false</parameter>
<parameter name="enableSwA">false</parameter>
+
+ <parameter name="EnableChildFirstClassLoading">false</parameter>
+
<!--Uncomment if you want to enable file caching for attachments -->
<!--parameter name="cacheAttachments">true</parameter>
<parameter name="attachmentDIR"></parameter>
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/Constants.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/Constants.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/Constants.java Tue Dec 28 20:29:12 2010
@@ -428,7 +428,12 @@ public class Constants extends org.apach
public static final String GENERATE_ABSOLUTE_LOCATION_URIS = "generateAbsoluteLocationURIs";
+ /**
+ * this parameter enables child first class loading.
+ * so the modules and services first use the classes in their class loader first
+ */
+ public static final String ENABLE_CHILD_FIRST_CLASS_LOADING="EnableChildFirstClassLoading";
}
}
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java Tue Dec 28 20:29:12 2010
@@ -43,6 +43,8 @@ public class DeploymentClassLoader exten
// List of jar files inside the jars in the original url
private List embedded_jars;
+ private boolean isChildFirstClassLoading;
+
/**
* DeploymentClassLoader is extended from URLClassLoader. The constructor
* does not override the super constructor, but takes in an addition list of
@@ -51,10 +53,14 @@ public class DeploymentClassLoader exten
* @param urls <code>URL</code>s
* @param parent parent classloader <code>ClassLoader</code>
*/
- public DeploymentClassLoader(URL[] urls, List embedded_jars, ClassLoader parent) {
+ public DeploymentClassLoader(URL[] urls,
+ List embedded_jars,
+ ClassLoader parent,
+ boolean isChildFirstClassLoading) {
super(urls, parent);
this.urls = urls;
this.embedded_jars = embedded_jars;
+ this.isChildFirstClassLoading = isChildFirstClassLoading;
}
/**
@@ -260,4 +266,29 @@ public class DeploymentClassLoader exten
}
return null;
}
+
+ protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+ Class c = null;
+ if (!isChildFirstClassLoading) {
+ c = super.loadClass(name, resolve);
+ } else {
+ c = findLoadedClass(name);
+ if (c == null) {
+ try {
+ c = findClass(name);
+ } catch (Exception e) {
+ c = super.loadClass(name, resolve);
+ }
+ }
+ }
+ return c;
+ }
+
+ public boolean isChildFirstClassLoading() {
+ return isChildFirstClassLoading;
+ }
+
+ public void setChildFirstClassLoading(boolean childFirstClassLoading) {
+ isChildFirstClassLoading = childFirstClassLoading;
+ }
}
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Tue Dec 28 20:29:12 2010
@@ -302,7 +302,8 @@ public abstract class DeploymentEngine i
new URL[]{moduleurl},
axisConfig.getModuleClassLoader(),
true,
- (File) axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ (File) axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
+ axisConfig.isChildFirstClassLoading());
AxisModule module = new AxisModule();
module.setModuleClassLoader(deploymentClassLoader);
module.setParent(axisConfig);
@@ -354,7 +355,8 @@ public abstract class DeploymentEngine i
new URL[]{servicesURL},
axisConfig.getServiceClassLoader(),
true,
- (File) axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ (File) axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
+ axisConfig.isChildFirstClassLoading());
String metainf = "meta-inf";
serviceGroup.setServiceGroupClassLoader(serviceClassLoader);
//processing wsdl.list
@@ -857,19 +859,20 @@ public abstract class DeploymentEngine i
*/
protected void setClassLoaders(String axis2repoURI) throws DeploymentException {
ClassLoader sysClassLoader =
- Utils.getClassLoader(Thread.currentThread().getContextClassLoader(), axis2repoURI);
+ Utils.getClassLoader(Thread.currentThread().getContextClassLoader(), axis2repoURI, false);
axisConfig.setSystemClassLoader(sysClassLoader);
if (servicesDir.exists()) {
axisConfig.setServiceClassLoader(
- Utils.getClassLoader(axisConfig.getSystemClassLoader(), servicesDir));
+ Utils.getClassLoader(axisConfig.getSystemClassLoader(), servicesDir, axisConfig.isChildFirstClassLoading()));
} else {
axisConfig.setServiceClassLoader(axisConfig.getSystemClassLoader());
}
if (modulesDir.exists()) {
axisConfig.setModuleClassLoader(Utils.getClassLoader(axisConfig.getSystemClassLoader(),
- modulesDir));
+ modulesDir,
+ axisConfig.isChildFirstClassLoading()));
} else {
axisConfig.setModuleClassLoader(axisConfig.getSystemClassLoader());
}
@@ -1020,7 +1023,8 @@ public abstract class DeploymentEngine i
axismodule = new AxisModule();
ArchiveReader archiveReader = new ArchiveReader();
- currentDeploymentFile.setClassLoader(false, config.getModuleClassLoader(), null);
+ currentDeploymentFile.setClassLoader(false, config.getModuleClassLoader(), null,
+ config.isChildFirstClassLoading());
axismodule.setModuleClassLoader(currentDeploymentFile.getClassLoader());
archiveReader.readModuleArchive(currentDeploymentFile, axismodule,
false, config);
@@ -1123,7 +1127,8 @@ public abstract class DeploymentEngine i
throws AxisFault {
try {
DeploymentFileData currentDeploymentFile = new DeploymentFileData(serviceFile, null);
- DeploymentClassLoader classLoader = Utils.createClassLoader(serviceFile);
+ DeploymentClassLoader classLoader = Utils.createClassLoader(serviceFile,
+ configCtx.getAxisConfiguration().isChildFirstClassLoading());
currentDeploymentFile.setClassLoader(classLoader);
AxisServiceGroup serviceGroup = new AxisServiceGroup();
serviceGroup.setServiceGroupClassLoader(classLoader);
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Tue Dec 28 20:29:12 2010
@@ -23,11 +23,9 @@ package org.apache.axis2.deployment;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisOperationFactory;
-import org.apache.axis2.description.InOnlyAxisOperation;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Deployable;
import org.apache.axis2.engine.MessageReceiver;
@@ -36,6 +34,7 @@ import org.apache.axis2.java.security.Ac
import org.apache.axis2.modules.Module;
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.axis2.util.Loader;
+import org.apache.axis2.util.JavaUtils;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -99,6 +98,18 @@ public class ModuleBuilder extends Descr
Iterator itr = moduleElement.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, module, module.getParent());
+
+ Parameter childFirstClassLoading =
+ module.getParameter(Constants.Configuration.ENABLE_CHILD_FIRST_CLASS_LOADING);
+ if (childFirstClassLoading != null){
+ DeploymentClassLoader deploymentClassLoader = (DeploymentClassLoader) module.getModuleClassLoader();
+ if (JavaUtils.isTrueExplicitly(childFirstClassLoading.getValue())){
+ deploymentClassLoader.setChildFirstClassLoading(true);
+ } else if (JavaUtils.isFalseExplicitly(childFirstClassLoading.getValue())){
+ deploymentClassLoader.setChildFirstClassLoading(false);
+ }
+ }
+
if (moduleClassAtt != null) {
String moduleClass = moduleClassAtt.getAttributeValue();
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java Tue Dec 28 20:29:12 2010
@@ -25,9 +25,11 @@ import org.apache.axis2.context.Configur
import org.apache.axis2.deployment.repository.util.ArchiveReader;
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.util.Utils;
+import org.apache.axis2.util.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -62,9 +64,11 @@ public class ModuleDeployer implements D
StringWriter errorWriter = new StringWriter();
boolean isDirectory = deploymentFileData.getFile().isDirectory();
try {
+
deploymentFileData.setClassLoader(isDirectory,
axisConfig.getModuleClassLoader(),
- (File)axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ (File)axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
+ this.axisConfig.isChildFirstClassLoading());
AxisModule metaData = new AxisModule();
metaData.setModuleClassLoader(deploymentFileData.getClassLoader());
metaData.setParent(axisConfig);
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java Tue Dec 28 20:29:12 2010
@@ -67,7 +67,8 @@ public class POJODeployer implements Dep
File parentFile = file.getParentFile();
ClassLoader classLoader =
Utils.getClassLoader(configCtx.getAxisConfiguration().
- getSystemClassLoader(), parentFile);
+ getSystemClassLoader(), parentFile,
+ configCtx.getAxisConfiguration().isChildFirstClassLoading());
Thread.currentThread().setContextClassLoader(classLoader);
String className = file.getName();
@@ -147,7 +148,8 @@ public class POJODeployer implements Dep
configCtx.getAxisConfiguration().getSystemClassLoader(),
true,
(File)configCtx.getAxisConfiguration().
- getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
+ configCtx.getAxisConfiguration().isChildFirstClassLoading());
Thread.currentThread().setContextClassLoader(classLoader);
className = className.replaceAll(".class", "");
className = className.replaceAll("/", ".");
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Tue Dec 28 20:29:12 2010
@@ -22,20 +22,13 @@ package org.apache.axis2.deployment;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingHelper;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.dataretrieval.DRConstants;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.AxisMessage;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisOperationFactory;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.ModuleConfiguration;
-import org.apache.axis2.description.ParameterInclude;
-import org.apache.axis2.description.PolicyInclude;
-import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.description.*;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.description.java2wsdl.TypeTable;
import org.apache.axis2.engine.MessageReceiver;
@@ -43,6 +36,7 @@ import org.apache.axis2.engine.ObjectSup
import org.apache.axis2.engine.ServiceLifeCycle;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.util.Loader;
+import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -131,6 +125,17 @@ public class ServiceBuilder extends Desc
TAG_PARAMETER));
processParameters(itr, service, service.getParent());
+ Parameter childFirstClassLoading =
+ service.getParameter(Constants.Configuration.ENABLE_CHILD_FIRST_CLASS_LOADING);
+ if (childFirstClassLoading != null){
+ DeploymentClassLoader deploymentClassLoader = (DeploymentClassLoader) service.getClassLoader();
+ if (JavaUtils.isTrueExplicitly(childFirstClassLoading.getValue())){
+ deploymentClassLoader.setChildFirstClassLoading(true);
+ } else if (JavaUtils.isFalseExplicitly(childFirstClassLoading.getValue())){
+ deploymentClassLoader.setChildFirstClassLoading(false);
+ }
+ }
+
// If multiple services in one service group have different values
// for the PARENT_FIRST
// parameter then the final value become the value specified by the
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java Tue Dec 28 20:29:12 2010
@@ -63,7 +63,8 @@ public class ServiceDeployer implements
try {
deploymentFileData.setClassLoader(isDirectory,
axisConfig.getServiceClassLoader(),
- (File)axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ (File)axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
+ axisConfig.isChildFirstClassLoading());
HashMap wsdlservice = archiveReader.processWSDLs(deploymentFileData);
if (wsdlservice != null && wsdlservice.size() > 0) {
Iterator services = wsdlservice.values().iterator();
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/TransportDeployer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/TransportDeployer.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/TransportDeployer.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/TransportDeployer.java Tue Dec 28 20:29:12 2010
@@ -53,7 +53,8 @@ public class TransportDeployer implement
try {
deploymentFileData.setClassLoader(isDirectory,
axisConfig.getModuleClassLoader(),
- (File) axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ (File) axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
+ axisConfig.isChildFirstClassLoading());
ClassLoader loader = deploymentFileData.getClassLoader();
Thread.currentThread().setContextClassLoader(loader);
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java Tue Dec 28 20:29:12 2010
@@ -102,7 +102,7 @@ public class DeploymentFileData {
this.classLoader = classLoader;
}
- public void setClassLoader(boolean isDirectory, ClassLoader parent, File file) throws AxisFault {
+ public void setClassLoader(boolean isDirectory, ClassLoader parent, File file, boolean isChildFirstClassLoading) throws AxisFault {
if (!isDirectory) {
if (this.file != null) {
URL[] urlsToLoadFrom;
@@ -112,14 +112,14 @@ public class DeploymentFileData {
this.file.getAbsolutePath()));
}
urlsToLoadFrom = new URL[]{this.file.toURL()};
- classLoader = Utils.createClassLoader(urlsToLoadFrom, parent, true, file);
+ classLoader = Utils.createClassLoader(urlsToLoadFrom, parent, true, file, isChildFirstClassLoading);
} catch (Exception e) {
throw AxisFault.makeFault(e);
}
}
} else {
if (this.file != null) {
- classLoader = Utils.getClassLoader(parent, this.file);
+ classLoader = Utils.getClassLoader(parent, this.file, isChildFirstClassLoading);
}
}
}
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Tue Dec 28 20:29:12 2010
@@ -304,9 +304,9 @@ public class Utils {
return f;
}
- public static ClassLoader getClassLoader(ClassLoader parent, String path)
+ public static ClassLoader getClassLoader(ClassLoader parent, String path, boolean isChildFirstClassLoading)
throws DeploymentException {
- return getClassLoader(parent, new File(path));
+ return getClassLoader(parent, new File(path), isChildFirstClassLoading);
}
/**
@@ -318,7 +318,7 @@ public class Utils {
* @return a new ClassLoader pointing to both the passed dir and jar files under lib/
* @throws DeploymentException if problems occur
*/
- public static ClassLoader getClassLoader(final ClassLoader parent, File file)
+ public static ClassLoader getClassLoader(final ClassLoader parent, File file, final boolean isChildFirstClassLoading)
throws DeploymentException {
URLClassLoader classLoader;
@@ -347,7 +347,7 @@ public class Utils {
if (useJarFileClassLoader()) {
return new JarFileClassLoader(urllist, parent);
} else {
- return new URLClassLoader(urllist, parent);
+ return new DeploymentClassLoader(urllist, null, parent, isChildFirstClassLoading);
}
}
});
@@ -666,13 +666,10 @@ public class Utils {
DeploymentFileData filedata = new DeploymentFileData(
inputFile);
- filedata
- .setClassLoader(
- false,
+ filedata.setClassLoader(false,
moduleClassLoader,
- (File)axisConfig
- .getParameterValue(
- Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ (File)axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
+ axisConfig.isChildFirstClassLoading());
HashMap wsdlservice = archiveReader.processWSDLs(filedata);
if (wsdlservice != null && wsdlservice.size() > 0) {
Iterator servicesitr = wsdlservice.values().iterator();
@@ -845,7 +842,7 @@ public class Utils {
excludeList.add("shutDown");
}
- public static DeploymentClassLoader createClassLoader(File serviceFile)
+ public static DeploymentClassLoader createClassLoader(File serviceFile, boolean isChildFirstClassLoading)
throws MalformedURLException {
ClassLoader contextClassLoader =
(ClassLoader)org.apache.axis2.java.security.AccessController
@@ -855,13 +852,14 @@ public class Utils {
}
});
return createDeploymentClassLoader(new URL[]{serviceFile.toURL()},
- contextClassLoader, new ArrayList());
+ contextClassLoader, new ArrayList(), isChildFirstClassLoading);
}
public static ClassLoader createClassLoader(ArrayList urls,
ClassLoader serviceClassLoader,
boolean extractJars,
- File tmpDir) {
+ File tmpDir,
+ boolean isChildFirstClassLoading) {
URL url = (URL)urls.get(0);
if (extractJars) {
try {
@@ -870,7 +868,7 @@ public class Utils {
urls.addAll(0, Arrays.asList(urls1));
URL[] urls2 = (URL[])urls.toArray(new URL[urls.size()]);
return createDeploymentClassLoader(urls2, serviceClassLoader,
- null);
+ null, isChildFirstClassLoading);
} catch (Exception e) {
log
.warn("Exception extracting jars into temporary directory : "
@@ -882,7 +880,7 @@ public class Utils {
List embedded_jars = Utils.findLibJars(url);
URL[] urls2 = (URL[])urls.toArray(new URL[urls.size()]);
return createDeploymentClassLoader(urls2, serviceClassLoader,
- embedded_jars);
+ embedded_jars, isChildFirstClassLoading);
}
public static File toFile(URL url) throws UnsupportedEncodingException {
@@ -893,12 +891,13 @@ public class Utils {
public static ClassLoader createClassLoader(URL[] urls,
ClassLoader serviceClassLoader,
boolean extractJars,
- File tmpDir) {
+ File tmpDir,
+ boolean isChildFirstClassLoading) {
if (extractJars) {
try {
URL[] urls1 = Utils.getURLsForAllJars(urls[0], tmpDir);
return createDeploymentClassLoader(urls1, serviceClassLoader,
- null);
+ null, isChildFirstClassLoading);
} catch (Exception e) {
log
.warn("Exception extracting jars into temporary directory : "
@@ -909,17 +908,17 @@ public class Utils {
}
List embedded_jars = Utils.findLibJars(urls[0]);
return createDeploymentClassLoader(urls, serviceClassLoader,
- embedded_jars);
+ embedded_jars, isChildFirstClassLoading);
}
private static DeploymentClassLoader createDeploymentClassLoader(
final URL[] urls, final ClassLoader serviceClassLoader,
- final List embeddedJars) {
+ final List embeddedJars, final boolean isChildFirstClassLoading) {
return (DeploymentClassLoader)AccessController
.doPrivileged(new PrivilegedAction() {
public Object run() {
return new DeploymentClassLoader(urls, embeddedJars,
- serviceClassLoader);
+ serviceClassLoader, isChildFirstClassLoading);
}
});
}
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/description/AxisDescription.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/description/AxisDescription.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/description/AxisDescription.java Tue Dec 28 20:29:12 2010
@@ -25,6 +25,7 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.modules.Module;
@@ -567,4 +568,6 @@ public abstract class AxisDescription im
return policySubject;
}
+
+
}
Modified: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=1053425&r1=1053424&r2=1053425&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Tue Dec 28 20:29:12 2010
@@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentHa
import javax.xml.namespace.QName;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.transaction.TransactionConfiguration;
import org.apache.axis2.builder.Builder;
import org.apache.axis2.builder.unknowncontent.UnknownContentBuilder;
@@ -63,6 +64,7 @@ import org.apache.axis2.phaseresolver.Ph
import org.apache.axis2.transport.MessageFormatter;
import org.apache.axis2.util.TargetResolver;
import org.apache.axis2.util.Utils;
+import org.apache.axis2.util.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -1332,4 +1334,13 @@ public class AxisConfiguration extends A
axisService, axisConfiguration);
}
}
+
+ public boolean isChildFirstClassLoading(){
+ boolean childFirstClassLoading = false;
+ Parameter isChildFirstClassLoading = this.getParameter(Constants.Configuration.ENABLE_CHILD_FIRST_CLASS_LOADING);
+ if (isChildFirstClassLoading != null){
+ childFirstClassLoading = JavaUtils.isTrueExplicitly(isChildFirstClassLoading.getValue());
+ }
+ return childFirstClassLoading;
+ }
}
Propchange: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922941,922983,935169,935174,935338,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,10
30538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,761709,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,761709,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922941,922983,935169,935174,935338,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,10300
08,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,761709,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,761709,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/parent:922914,922941,922983,935169,935174,935338,936434,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,103
2681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/parent:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/parent:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:937004,937237,939924,966536,980242,981055-981056,981058,981992,982008,990445,1001453-1001466,1001673,1029034,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
/webservices/axis2/branches/java/1_5/modules/saaj/test/org/apache/axis2/saaj/TestConstants.java:745088,749052,749058,751161,751271,760467
-/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:729037,752906,788202,802447,804541,823960,889783
+/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:729037,752906,776555,776612,788202,802447,804541,823960,889783
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/module:922983,937004,937237,939924,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/soapmonitor/module:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,778060,780546,788202,795431,802447,804541,805578,806085,806331,807512,816804,816812,817965,821686,821689,823960,889783,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,776555,776612,778060,780546,788202,795431,802447,804541,805578,806085,806331,807512,816804,816812,817965,821686,821689,823960,889783,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:922914,922983,937004,937237,939924,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
/webservices/axis2/branches/java/1_5/modules/soapmonitor/pom.xml:745088,749052,749058,751161,751271,760467,765840
-/webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,778060,780546,788202,795431,802447,804541,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823960,889783,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,776555,776612,778060,780546,788202,795431,802447,804541,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823960,889783,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:922914,922983,937004,937237,939924,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/handlers:745088,749052,749058,751161,751271,760467,765840
-/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,777648,778060,780546,788202,795431,802447,804541,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823960,889783,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,776555,776612,777648,778060,780546,788202,795431,802447,804541,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823960,889783,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:922914,922983,937004,937237,939924,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/META-INF/module.xml:745088,749052,749058,751161,751271,760467,765840
-/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,778060,780546,788202,795431,802447,804541,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823960,889783,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,776555,776612,778060,780546,788202,795431,802447,804541,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823960,889783,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet:922914,937004,937237,939924,965032,965056,965213,966536,980242,981055-981056,981058,981992,982008,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/soapmonitor/servlet:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,778060,780546,788202,795431,802447,804541,805578,806085,806331,807512,816804,816812,817965,821686,821689,823960,889783,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,776555,776612,778060,780546,788202,795431,802447,804541,805578,806085,806331,807512,816804,816812,817965,821686,821689,823960,889783,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:922914,937004,937237,939924,965032,965056,965213,966536,980242,981055-981056,981058,981992,982008,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/soapmonitor/applet:745088,749052,749058,751161,751271,760467,765840
-/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,777648,778060,780546,788202,795431,802447,804541,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823960,889783,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,776555,776612,777648,778060,780546,788202,795431,802447,804541,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823960,889783,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,3 +1,3 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:922914,937004,937237,939924,965032,965056,965213,966536,980242,981055-981056,981058,981992,982008,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
/webservices/axis2/branches/java/1_5/modules/soapmonitor/src/org/apache/axis2/soapmonitor/servlet:745088,749052,749058,751161,751271,760467,765840
-/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,777648,778060,780546,788202,795431,802447,804541,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823960,889783,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,776555,776612,777648,778060,780546,788202,795431,802447,804541,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823960,889783,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin:922914,922941,922983,935169,935174,935338,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,988689,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,10320
01,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/tool/axis2-repo-maven-plugin:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/tool/axis2-repo-maven-plugin:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922941,922983,935169,935174,935338,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,10
32401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922941,922983,935169,935174,935338,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,103240
1,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/transport/http/src:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/src:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922983,935169,935174,935338,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1
032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/transport/local:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/local:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922941,922983,935169,935174,935338,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031
350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,761709,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,761709,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 20:29:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,922983,935169,935174,935338,937004,937237,939924,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,103053
8,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,761709,771051,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,761709,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823960,834058,834175,889783,902271,904660,904780,905980