On Thu, Aug 19, 2010 at 23:38, <[email protected]> wrote: > Author: gdaniels > Date: Thu Aug 19 21:38:10 2010 > New Revision: 987320 > > URL: http://svn.apache.org/viewvc?rev=987320&view=rev > Log: > Merge over r987313 from trunk. There were a few merge conflicts(?) which I > manually fixed, and I'm allowing all the mergeinfo updates, even the ones > that look odd to me. As such, let me know if anything seems weird with this > commit.
Looks good. There are updates to the svn:mergeinfo property of multiple directories because in previous commits on the 1.5 branch, there have been svn move operations and because some merge operations have been done only on subtrees. This is perfectly normal. > > Modified: > axis/axis2/java/core/branches/java/1_5/ (props changed) > axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props > changed) > axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/ (props changed) > > axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java > (props changed) > > axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java > (props changed) > axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/ (props > changed) > axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed) > axis/axis2/java/core/branches/java/1_5/modules/resource-bundle/ (props > changed) > axis/axis2/java/core/branches/java/1_5/modules/samples/ (props changed) > axis/axis2/java/core/branches/java/1_5/modules/samples/book/ (props > changed) > axis/axis2/java/core/branches/java/1_5/modules/samples/java_first_jaxws/ > (props changed) > axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-addressbook/ > (props changed) > axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-calculator/ > (props changed) > axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-interop/ > (props changed) > axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-samples/ > (props changed) > axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-version/ > (props changed) > axis/axis2/java/core/branches/java/1_5/modules/samples/version/ (props > changed) > > axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/ > (props changed) > > axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/ > (props changed) > > axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/ > (props changed) > axis/axis2/java/core/branches/java/1_5/modules/transport/http/ (props > changed) > axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml > (props changed) > axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ > (props changed) > axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props > changed) > > axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java > (props changed) > > axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java > (props changed) > > Propchange: axis/axis2/java/core/branches/java/1_5/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Aug 19 21:38:10 2010 > @@ -1,2 +1,2 @@ > -/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > +/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > /webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980 > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Aug 19 21:38:10 2010 > @@ -1,2 +1,2 @@ > -/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > +/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > /webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980 > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Aug 19 21:38:10 2010 > @@ -1,2 +1,2 @@ > -/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > +/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980 > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Aug 19 21:38:10 2010 > @@ -1,2 +1,2 @@ > -/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > +/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > /webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980 > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Aug 19 21:38:10 2010 > @@ -1,2 +1,2 @@ > -/axis/axis2/java/core/trunk/modules/parent:922914,922983,935169,935174,935338,936434,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > +/axis/axis2/java/core/trunk/modules/parent:922914,922983,935169,935174,935338,936434,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > /webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980 > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/resource-bundle/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/samples/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/samples/book/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/samples/java_first_jaxws/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-addressbook/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-calculator/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-interop/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-samples/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-version/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/samples/version/ > ------------------------------------------------------------------------------ > --- svn:ignore (original) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -1,4 +1,4 @@ > -version.iml > +*.iml > target > .settings > .classpath > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/ > ------------------------------------------------------------------------------ > --- svn:ignore (original) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -1,4 +1,4 @@ > -axis2.eclipse.codegen.plugin.iml > +*.iml > target > META-INF > lib > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/ > ------------------------------------------------------------------------------ > --- svn:ignore (original) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -1,4 +1,4 @@ > -axis2.eclipse.service.plugin.iml > +*.iml > target > META-INF > lib > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/ > ------------------------------------------------------------------------------ > --- svn:ignore (original) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -2,3 +2,4 @@ > target > .classpath > .project > +*.iml > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -0,0 +1 @@ > +*.iml > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Aug 19 21:38:10 2010 > @@ -1,2 +1,2 @@ > -/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > +/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > /webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980 > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Aug 19 21:38:10 2010 > @@ -1,2 +1,2 @@ > -/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > +/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > /webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980 > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/ > ------------------------------------------------------------------------------ > --- svn:ignore (original) > +++ svn:ignore Thu Aug 19 21:38:10 2010 > @@ -2,3 +2,4 @@ target > .classpath > .project > .settings > +*.iml > > Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Aug 19 21:38:10 2010 > @@ -1,2 +1,2 @@ > -/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > +/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > /webservices/axis2/trunk/java/modules/transport/local:733539,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980 > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Aug 19 21:38:10 2010 > @@ -1,2 +1,2 @@ > -/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > +/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > /webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980 > > Propchange: > axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Aug 19 21:38:10 2010 > @@ -1,2 +1,2 @@ > -/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > +/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,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 > /webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980 > > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
