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 2011/09/05 11:50:03 UTC
svn commit: r1165224 - in /axis/axis2/java/core/branches/1_5: ./
modules/distribution/ modules/jaxws/test/org/apache/axis2/jaxws/client/
modules/kernel/src/org/apache/axis2/transport/http/util/
modules/kernel/test/org/apache/axis2/transport/http/util/ ...
Author: veithen
Date: Mon Sep 5 09:50:02 2011
New Revision: 1165224
URL: http://svn.apache.org/viewvc?rev=1165224&view=rev
Log:
Merged r1037135 and r1037218 to the 1.5 branch to fix the ConcurrentModificationException that sometimes causes the Hudson build to fail.
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/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.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/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
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 Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1032
681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1032
681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922941,922971,922983,935122,935169,935174,935338,936434,937004,937237,939924,944074,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,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/distribution:922914,922941,922971,922983,935122,935169,935174,935338,936434,937004,937237,939924,944074,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,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
Modified: axis/axis2/java/core/branches/1_5/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java?rev=1165224&r1=1165223&r2=1165224&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java Mon Sep 5 09:50:02 2011
@@ -84,8 +84,6 @@ public class ReleaseServiceTests extends
epDesc= svcDesc.getEndpointDescription(portQN, delegate);
assertNull(epDesc);
- } catch (Throwable t) {
- fail("Caught throwable " + t);
} finally {
ClientMetadataTest.restoreOriginalFactory();
}
@@ -107,8 +105,6 @@ public class ReleaseServiceTests extends
svc1.addPort(portQN, bindingID1, epr1);
}
org.apache.axis2.jaxws.spi.ServiceDelegate.releaseService(svc1);
- } catch (Throwable t) {
- fail("Caught throwable " + t);
} finally {
ClientMetadataTest.restoreOriginalFactory();
}
@@ -135,8 +131,6 @@ public class ReleaseServiceTests extends
}
org.apache.axis2.jaxws.spi.ServiceDelegate.releaseService(svc1);
}
- } catch (Throwable t) {
- fail("Caught throwable " + t);
} finally {
ClientMetadataTest.restoreOriginalFactory();
}
@@ -541,8 +535,6 @@ public class ReleaseServiceTests extends
ClientMetadataPortSEI port = genSvc.getPort(ClientMetadataPortSEI.class);
org.apache.axis2.jaxws.spi.ServiceDelegate.releaseService(genSvc);
}
- } catch (Throwable t) {
- fail("Caught throwable " + t);
} finally {
ClientMetadataTest.restoreOriginalFactory();
}
Propchange: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,10296
10-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,10296
10-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
Modified: axis/axis2/java/core/branches/1_5/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java?rev=1165224&r1=1165223&r2=1165224&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java Mon Sep 5 09:50:02 2011
@@ -503,18 +503,22 @@ public class DescriptionFactoryImpl {
log.debug("ServiceDescription not in use; will be removed from cache");
}
svcDescRemoved = true;
- Set<Map.Entry<DescriptionKey, ServiceDescription>> cacheEntrySet =
- cache.entrySet();
- Iterator<Map.Entry<DescriptionKey, ServiceDescription>> cacheEntryIterator =
- cacheEntrySet.iterator();
- while (cacheEntryIterator.hasNext()) {
- Map.Entry<DescriptionKey, ServiceDescription> entry =
- cacheEntryIterator.next();
- ServiceDescription entrySvcDescValue = entry.getValue();
- if (svcDesc == entrySvcDescValue) {
- cacheEntryIterator.remove();
- if (log.isDebugEnabled()) {
- log.debug("Removed service description from cache");
+ // Even if we use a Hashtable, we need to synchronize here to avoid
+ // ConcurrentModificationException when iterating over the entries.
+ synchronized (cache) {
+ Set<Map.Entry<DescriptionKey, ServiceDescription>> cacheEntrySet =
+ cache.entrySet();
+ Iterator<Map.Entry<DescriptionKey, ServiceDescription>> cacheEntryIterator =
+ cacheEntrySet.iterator();
+ while (cacheEntryIterator.hasNext()) {
+ Map.Entry<DescriptionKey, ServiceDescription> entry =
+ cacheEntryIterator.next();
+ ServiceDescription entrySvcDescValue = entry.getValue();
+ if (svcDesc == entrySvcDescValue) {
+ cacheEntryIterator.remove();
+ if (log.isDebugEnabled()) {
+ log.debug("Removed service description from cache");
+ }
}
}
}
Propchange: axis/axis2/java/core/branches/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/parent:922914,922941,922971,922983,935122,935169,935174,935338,936434,937004,937237,939924,944074,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,103200
1,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/parent:922914,922941,922971,922983,935122,935169,935174,935338,936434,937004,937237,939924,944074,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,103200
1,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:922971,935122,937004,937237,939924,944074,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:922971,935122,937004,937237,939924,944074,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,776555,776612,783869,783873,787379,788202,797969,802447,804541,805530,823125,823960,889783,896320,905783,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module:922971,922983,935122,937004,937237,939924,944074,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,
1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/soapmonitor/module:922971,922983,935122,937004,937237,939924,944074,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,
1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,802447,804541,805530,805578,806085,806331,807512,816804,816812,817965,821686,821689,823125,823960,889783,896320,902271,905783,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:922914,922971,922983,935122,937004,937237,939924,944074,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1
136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:922914,922971,922983,935122,937004,937237,939924,944074,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1
128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,776555,776612,778060,780546,783869,783873,787379,788202,795431,797969,802447,804541,805530,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823125,823960,889783,896320,902271,905783,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:922914,922971,922983,935122,937004,937237,939924,944074,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1
128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:922914,922971,922983,935122,937004,937237,939924,944074,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1
100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,776555,776612,777648,778060,780546,783869,783873,787379,788202,795431,797969,802447,804541,805530,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823125,823960,889783,896320,902271,905783,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:922914,922971,922983,935122,937004,937237,939924,944074,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,11
28584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:922914,922971,922983,935122,937004,937237,939924,944074,965032,965056,966401,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,11
00628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,776555,776612,778060,780546,783869,783873,787379,788202,795431,797969,802447,804541,805530,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823125,823960,889783,896320,902271,905783,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/servlet:922914,922971,935122,937004,937237,939924,944074,965032,965056,965213,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159
,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet:922914,922971,935122,937004,937237,939924,944074,965032,965056,965213,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438
,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,802447,804541,805530,805578,806085,806331,807512,816804,816812,817965,821686,821689,823125,823960,889783,896320,902271,905783,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:922914,922971,935122,937004,937237,939924,944074,965032,965056,965213,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,11010
37,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:922914,922971,935122,937004,937237,939924,944074,965032,965056,965213,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,10993
89,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,776555,776612,777648,778060,780546,783869,783873,787379,788202,795431,797969,802447,804541,805530,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823125,823960,889783,896320,902271,905783,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:922914,922971,935122,937004,937237,939924,944074,965032,965056,965213,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101
037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:922914,922971,935122,937004,937237,939924,944074,965032,965056,965213,966536,980242,981055-981056,981058,981992,982008,987313,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,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099
389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,776555,776612,777648,778060,780546,783869,783873,787379,788202,795431,797969,802447,804541,805530,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,823125,823960,889783,896320,902271,905783,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,10317
99,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,10317
99,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1
032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1
032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1032
001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1032
001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
Propchange: axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 09:50:02 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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-1
029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,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-1
029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037135,1037144,1037210,1037218,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305,1156382,1157501,1157522
/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,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318