Author: veithen Date: Tue Aug 10 20:13:23 2010 New Revision: 984196 URL: http://svn.apache.org/viewvc?rev=984196&view=rev Log: Merged r983280 to the 1.5 branch.
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/distribution/pom.xml 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/distribution/src/main/assembly/src-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/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/README-std-src.txt Propchange: axis/axis2/java/core/branches/java/1_5/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 10 20:13:23 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 +/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 /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,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 10 20:13:23 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 +/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 /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,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml?rev=984196&r1=984195&r2=984196&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml Tue Aug 10 20:13:23 2010 @@ -187,6 +187,26 @@ <build> <plugins> <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <id>generate-timestamp</id> + <phase>package</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + import java.util.Date + import java.text.MessageFormat + project.properties['buildTimestamp'] = MessageFormat.format("{0,date,dd-MM-yyyy}", new Date()) + </source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.axis2</groupId> <artifactId>axis2-repo-maven-plugin</artifactId> <executions> 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=984196&r1=984195&r2=984196&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 Tue Aug 10 20:13:23 2010 @@ -128,11 +128,13 @@ <!-- TODO: Need to rename this file to INSTALL.txt --> <fileSet> - <directory>target/tmp-doc-distro/docs</directory> + <directory>../../release-docs/readme-files</directory> <outputDirectory></outputDirectory> <includes> + <include>README-std-bin.txt</include> <include>installation-std-bin.txt</include> </includes> + <filtered>true</filtered> </fileSet> <fileSet> Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml?rev=984196&r1=984195&r2=984196&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml Tue Aug 10 20:13:23 2010 @@ -110,11 +110,12 @@ </includes> </fileSet> <fileSet> - <directory>target/tmp-doc-distro/docs</directory> + <directory>../../release-docs/readme-files</directory> <outputDirectory></outputDirectory> <includes> <include>README-std-src.txt</include> </includes> + <filtered>true</filtered> </fileSet> </fileSets> </assembly> 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 Tue Aug 10 20:13:23 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 +/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 /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,807487,816740,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 Tue Aug 10 20:13:23 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 +/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 /webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 10 20:13:23 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 +/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 /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,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 10 20:13:23 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 +/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 /webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777882,777897,777934,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 10 20:13:23 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 +/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 /webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777882,777897,777934,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 10 20:13:23 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 +/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 /webservices/axis2/trunk/java/modules/transport/local:733539,771051,777882,777897,777934,801630,803725,805999,807160,807487,816740,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 Tue Aug 10 20:13:23 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 +/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 /webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,807487,816740,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 Tue Aug 10 20:13:23 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 +/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 /webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,807487,816740,834058,834175,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=984196&r1=984195&r2=984196&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 Tue Aug 10 20:13:23 2010 @@ -17,7 +17,7 @@ * under the License. */ ====================================================== -Apache Axis2 @axisVersion@ build (@TODAY@) +Apache Axis2 ${project.version} build (${buildTimestamp}) Binary Release http://ws.apache.org/axis2 @@ -27,27 +27,27 @@ This is the Standard Binary Release of A The lib directory contains; -1. axis2-a...@axisversion@.jar -2. axis2-adb-codeg...@axisversion@.jar -3. axis2-ant-plug...@axisversion@.jar -4. axis2-clusteri...@axisversion@.jar -5. axis2-codeg...@axisversion@.jar -6. axis2-cor...@axisversion@.jar -7. axis2-fastinfos...@axisversion@.jar -8. axis2-java2ws...@axisversion@.jar -9. axis2-jaxb...@axisversion@.jar -10. axis2-jax...@axisversion@.jar -11. axis2-jaxws-a...@axisversion@.jar -12. axis2-ji...@axisversion@.jar -13. axis2-js...@axisversion@.jar -14. axis2-jws-a...@axisversion@.jar -15. axis2-kern...@axisversion@.jar -16. axis2-metada...@axisversion@.jar -17. axis2-sa...@axisversion@.jar -18. axis2-saaj-a...@axisversion@.jar -19. axis2-soapmonit...@axisversion@.jar -20. axis2-spri...@axisversion@.jar -21. axis2-xmlbea...@axisversion@.jar +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. Modified: axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/README-std-src.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/README-std-src.txt?rev=984196&r1=984195&r2=984196&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/README-std-src.txt (original) +++ axis/axis2/java/core/branches/java/1_5/release-docs/readme-files/README-std-src.txt Tue Aug 10 20:13:23 2010 @@ -17,7 +17,7 @@ * under the License. */ ====================================================== -Apache Axis2 @axisVersion@ build (@TODAY@) +Apache Axis2 ${project.version} build (${buildTimestamp}) Source Release http://ws.apache.org/axis2