You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2010/08/28 16:30:47 UTC

svn commit: r990376 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/util/ module...

Author: veithen
Date: Sat Aug 28 14:30:47 2010
New Revision: 990376

URL: http://svn.apache.org/viewvc?rev=990376&view=rev
Log:
Merged r990369 to the 1.5 branch.

Modified:
    axis/axis2/java/core/branches/java/1_5/   (props changed)
    axis/axis2/java/core/branches/java/1_5/README.txt
    axis/axis2/java/core/branches/java/1_5/modules/distribution/   (props changed)
    axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml
    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/parent/   (props changed)
    axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/   (props changed)
    axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/pom.xml   (props changed)
    axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/   (props changed)
    axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml   (props changed)
    axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/   (props changed)
    axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/   (props changed)
    axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/   (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)
    axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/README-std-bin.txt
    axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/installation-std-bin.txt

Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369
 /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,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980

Modified: axis/axis2/java/core/branches/java/1_5/README.txt
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/README.txt?rev=990376&r1=990375&r2=990376&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/README.txt (original)
+++ axis/axis2/java/core/branches/java/1_5/README.txt Sat Aug 28 14:30:47 2010
@@ -1,5 +1,5 @@
 ======================================================
-Apache Axis2 @axisVersion@ build  (@TODAY@)
+Apache Axis2 ${project.version} build (${buildTimestamp})
 
 http://ws.apache.org/axis2
 ------------------------------------------------------
@@ -65,10 +65,10 @@ or in the JIRA issue tracker. If you are
 list make sure to add the [Axis2] prefix to the subject.
 
 Mailing list subscription:
-    axis-dev-subscribe@ws.apache.org
+    java-dev-subscribe@axis.apache.org
 
 Jira:
-    http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10611
+    http://issues.apache.org/jira/browse/AXIS2
 
 
 Thank you for using Axis2!

Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/distribution:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369
 /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,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980

Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml?rev=990376&r1=990375&r2=990376&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml Sat Aug 28 14:30:47 2010
@@ -155,6 +155,7 @@
                 <include>README.txt</include>
                 <include>release-notes.html</include>
             </includes>
+            <filtered>true</filtered>
         </fileSet>
 
         <!-- copy samples -->

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 Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922941,922983,935169,935174,935338,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,987712-987715,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369
 /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,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 Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922941,922983,935169,935174,935338,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,987712-987715,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369
 /webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980

Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/parent:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/parent:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369
 /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,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980

Propchange: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module:922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/soapmonitor/module:922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350,990369
 /webservices/axis2/trunk/java/modules/soapmonitor/module:816804,816812

Propchange: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:922914,922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:922914,922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350,990369
 /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:807160,816804,816812

Propchange: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:922914,922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:922914,922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350,990369
 /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:777648,807160,816804,816812

Propchange: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:922914,922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:922914,922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350,990369
 /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:807160,816804,816812

Propchange: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/servlet:922914,965032,965056,965213,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet:922914,965032,965056,965213,987783,987832,987873,987883,987913,987935,990350,990369
 /webservices/axis2/trunk/java/modules/soapmonitor/servlet:816804,816812

Propchange: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:922914,965032,965056,965213,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:922914,965032,965056,965213,987783,987832,987873,987883,987913,987935,990350,990369
 /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:777648,807160,816804,816812

Propchange: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:922914,965032,965056,965213,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:922914,965032,965056,965213,987783,987832,987873,987883,987913,987935,990350,990369
 /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:777648,807160,816804,816812

Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369
 /webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980

Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369
 /webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980

Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369
 /webservices/axis2/trunk/java/modules/transport/local:733539,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,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 Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922941,922983,935169,935174,935338,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,987712-987715,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369
 /webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,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 Sat Aug 28 14:30:47 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,922983,935169,935174,935338,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,987712-987715,987783,987832,987873,987883,987913,987935,990350
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,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,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369
 /webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777648,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980

Modified: axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/README-std-bin.txt
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/README-std-bin.txt?rev=990376&r1=990375&r2=990376&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/README-std-bin.txt (original)
+++ axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/README-std-bin.txt Sat Aug 28 14:30:47 2010
@@ -25,31 +25,8 @@ http://ws.apache.org/axis2
 
 This is the Standard Binary Release of Axis2.
 
-The lib directory contains;
-
-1. axis2-adb-${project.version}.jar
-2. axis2-adb-codegen-${project.version}.jar
-3. axis2-ant-plugin-${project.version}.jar
-4. axis2-clustering-${project.version}.jar
-5. axis2-codegen-${project.version}.jar
-6. axis2-corba-${project.version}.jar
-7. axis2-fastinfoset-${project.version}.jar
-8. axis2-java2wsdl-${project.version}.jar
-9. axis2-jaxbri-${project.version}.jar
-10. axis2-jaxws-${project.version}.jar
-11. axis2-jaxws-api-${project.version}.jar
-12. axis2-jibx-${project.version}.jar
-13. axis2-json-${project.version}.jar
-14. axis2-jws-api-${project.version}.jar
-15. axis2-kernel-${project.version}.jar
-16. axis2-metadata-${project.version}.jar
-17. axis2-saaj-${project.version}.jar
-18. axis2-saaj-api-${project.version}.jar
-19. axis2-soapmonitor-${project.version}.jar
-20. axis2-spring-${project.version}.jar
-21. axis2-xmlbeans-${project.version}.jar
-
-and all 3rd party distributable dependencies of the above jars.
+The lib directory contains the Axis2 jars and all 3rd party distributable dependencies of
+these jars.
 
 The repository/modules directory contains the deployable addressing module.
 

Modified: axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/installation-std-bin.txt
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/installation-std-bin.txt?rev=990376&r1=990375&r2=990376&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/installation-std-bin.txt (original)
+++ axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/installation-std-bin.txt Sat Aug 28 14:30:47 2010
@@ -22,7 +22,7 @@
 
 1. Download and Install the Apache Axis2 Binary Distribution
 
-  Download and install a Java Development Kit (JDK) release (version 1.4 or
+  Download and install a Java Development Kit (JDK) release (version 1.5 or
   later) from http://java.sun.com/j2se/. Install the JDK according to the
   instructions included with the release. Set an environment variable JAVA_HOME 
   to the pathname of the directory into which you installed the JDK release.
@@ -30,13 +30,13 @@
   Download and unpack the Axis2 Binary Distribution into a convenient
   location so that the distribution resides in its own directory. Set an 
   environment variables AXIS2_HOME to the pathname of the extracted directory 
-  of Axis2 (Eg: /opt/axis2-1.4).
+  of Axis2 (Eg: /opt/axis2-${project.version}).
 
 
 2. Starting up Axis2 Standalone Server
 
   Standalone Axis2 server can be started by executing the following commands:
-  			$AXIS2_HOME\bin\axis2server.bat (Windows)
+  			%AXIS2_HOME%\bin\axis2server.bat (Windows)
   			$AXIS2_HOME/bin/axis2server.sh (Unix)
 
   After startup, the default web services included with Axis2 will be available 
@@ -72,7 +72,7 @@ Distribution
   essential jars are missing. At such a situation the documentation of the 
   particular servlet container should be consulted to find the problem. 
   
-  Read http://ws.apache.org/axis2/1_4/installationguide.html#servlet_container
+  Read http://ws.apache.org/axis2/1_5/installationguide.html#servlet_container
   for more information.
   
    
@@ -116,8 +116,8 @@ Distribution
      Usage: WSDL2Java.{sh|bat} [OPTION]... -uri <Location of WSDL>
         Eg: WSDL2Java.sh -uri ../wsdl/Axis2Sample.wsdl
         
-   A more detailed reference about this script can be found http://
-   ws.apache.org/axis2/1_4/reference.html.
+   A more detailed reference about this script can be found
+   http://ws.apache.org/axis2/1_5/reference.html.
    
    
    * java2wsdl.{bat|sh} 	
@@ -126,12 +126,12 @@ Distribution
      Usage: Java2WSDL.{sh|bat} [OPTION]... -cn <fully qualified class name>
         Eg: Java2WSDL.sh -cn ../samples/test/searchTool.Search
         
-   A more detailed reference about this script can be found in http://
-   ws.apache.org/axis2/1_4/reference.html
+   A more detailed reference about this script can be found in
+   http://ws.apache.org/axis2/1_5/reference.html
 
 Complete Installation Guide
 ===========================
 A complete Installation Guide on Apache Axis2 is available at
-http://ws.apache.org/axis2/1_4/installationguide.html
+http://ws.apache.org/axis2/1_5/installationguide.html