svn commit: r987873 - in /axis/axis2/java/core/trunk/modules/webapp: conf/web.xml pom.xml
Author: veithen Date: Sun Aug 22 11:44:59 2010 New Revision: 987873 URL: http://svn.apache.org/viewvc?rev=987873&view=rev Log: Added a sample configuration for the SOAP monitor servlet and include the applet classes in the webapp. To use the SOAP monitor, it is now sufficient to uncomment the servlet configuration in web.xml and to engage the soapmonitor module. Modified: axis/axis2/java/core/trunk/modules/webapp/conf/web.xml axis/axis2/java/core/trunk/modules/webapp/pom.xml Modified: axis/axis2/java/core/trunk/modules/webapp/conf/web.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/conf/web.xml?rev=987873&r1=987872&r2=987873&view=diff == --- axis/axis2/java/core/trunk/modules/webapp/conf/web.xml (original) +++ axis/axis2/java/core/trunk/modules/webapp/conf/web.xml Sun Aug 22 11:44:59 2010 @@ -45,6 +45,18 @@ org.apache.axis2.webapp.AxisAdminServlet + + + AxisServlet /servlet/AxisServlet @@ -65,6 +77,11 @@ /axis2-admin/* + + inc text/plain Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=987873&r1=987872&r2=987873&view=diff == --- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sun Aug 22 11:44:59 2010 @@ -278,6 +278,22 @@ +maven-dependency-plugin + + +generate-resources + +unpack-dependencies + + + ${project.build.directory}/webResources + soapmonitor-servlet + org/apache/axis2/soapmonitor/applet/**/*.class + + + + + maven-war-plugin axis2
svn commit: r987883 - in /axis/axis2/java/core/trunk/modules: distribution/pom.xml soapmonitor/module/pom.xml soapmonitor/servlet/pom.xml webapp/pom.xml
Author: veithen Date: Sun Aug 22 12:05:36 2010 New Revision: 987883 URL: http://svn.apache.org/viewvc?rev=987883&view=rev Log: Changed the artifactId of soapmonitor-servlet to axis2-soapmonitor-servlet, so that it is consistent with the naming conventions used by other libraries/modules (libraries have the "axis2-" prefix, while MARs don't have it). Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml axis/axis2/java/core/trunk/modules/webapp/pom.xml Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=987883&r1=987882&r2=987883&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Aug 22 12:05:36 2010 @@ -87,7 +87,7 @@ org.apache.axis2 -soapmonitor-servlet +axis2-soapmonitor-servlet ${project.version} Modified: axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml?rev=987883&r1=987882&r2=987883&view=diff == --- axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml Sun Aug 22 12:05:36 2010 @@ -40,7 +40,7 @@ org.apache.axis2 -soapmonitor-servlet +axis2-soapmonitor-servlet ${project.version} Modified: axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml?rev=987883&r1=987882&r2=987883&view=diff == --- axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml Sun Aug 22 12:05:36 2010 @@ -28,7 +28,7 @@ SNAPSHOT ../../parent/pom.xml -soapmonitor-servlet +axis2-soapmonitor-servlet jar Apache Axis2 - SOAP Monitor Servlet soapmonitor servlet for Axis2 Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=987883&r1=987882&r2=987883&view=diff == --- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sun Aug 22 12:05:36 2010 @@ -287,7 +287,7 @@ ${project.build.directory}/webResources - soapmonitor-servlet + axis2-soapmonitor-servlet org/apache/axis2/soapmonitor/applet/**/*.class
svn commit: r987904 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/documentation/xdocs/@axis2_version_dir@/ modules/kernel/src/org/apache/axis2/transport/http/util/ mod
Author: veithen Date: Sun Aug 22 13:37:20 2010 New Revision: 987904 URL: http://svn.apache.org/viewvc?rev=987904&view=rev Log: Merged the SOAP monitor refactoring (split between Axis2 module code and applet/servlet code) to the 1.5 branch so that we get a proper Maven artifact for the servlet code. This makes packaging of the distributions easier. Added: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/ (props changed) - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/pom.xml (contents, props changed) - copied, changed from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ (props changed) - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/SOAPMonitorHandler.java - copied unchanged from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/SOAPMonitorHandler.java axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/SOAPMonitorModule.java - copied unchanged from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/soapmonitor/SOAPMonitorModule.java axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/resources/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/resources/META-INF/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml (props changed) - copied unchanged from r777648, webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/ (props changed) - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/servlet/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/pom.xml - copied, changed from r777648, webservices/axis2/trunk/java/modules/soapmonitor/servlet/pom.xml axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/ - copied from r777648, webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/ - copied from r777648, webservices/axis2/trunk/java/modules/soapm
svn commit: r987906 [1/2] - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport
Author: veithen Date: Sun Aug 22 13:59:02 2010 New Revision: 987906 URL: http://svn.apache.org/viewvc?rev=987906&view=rev Log: Merged the webapp fixes (r987783,987832,987873,987883) to the 1.5 branch. Removed: axis/axis2/java/core/branches/java/1_5/modules/webapp/conf/modules.list axis/axis2/java/core/branches/java/1_5/modules/webapp/conf/services.list 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/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 (contents, 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/pom.xml 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/conf/web.xml axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml 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 Sun Aug 22 13:59:02 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 +/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 /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,816891,834058,834175,904660,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 22 13:59:02 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,98
svn commit: r987913 - in /axis/axis2/java/core/trunk/modules/distribution: pom.xml src/main/assembly/war-assembly.xml
Author: veithen Date: Sun Aug 22 14:43:04 2010 New Revision: 987913 URL: http://svn.apache.org/viewvc?rev=987913&view=rev Log: Fixed the WAR distribution. Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=987913&r1=987912&r2=987913&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Aug 22 14:43:04 2010 @@ -216,6 +216,14 @@ log4j log4j + + + +org.apache.axis2 +axis2-webapp +${project.version} +war + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/distribution Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml?rev=987913&r1=987912&r2=987913&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml Sun Aug 22 14:43:04 2010 @@ -23,29 +23,25 @@ zip - - - - ../../modules/webapp/target - - - *.war - - - - target/tmp-doc-distro/docs - - -LICENSE.txt -NOTICE.txt -README.txt -release-notes.html - - - - - - org.apache.axis2:webapp - - + + +false + +org.apache.axis2:axis2-webapp + +axis2.war + + + + +../.. + + +LICENSE.txt +NOTICE.txt +README.txt +release-notes.html + + +
svn commit: r987921 - 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/kern
Author: veithen Date: Sun Aug 22 15:43:18 2010 New Revision: 987921 URL: http://svn.apache.org/viewvc?rev=987921&view=rev Log: Merged r987913 (fix of the WAR distribution) 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/war-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) Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 22 15:43:18 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 +/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 /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,816891,834058,834175,904660,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 22 15:43:18 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
svn commit: r987922 - in /axis/axis2/java/core/trunk: ./ modules/adb-codegen/test-resources/testsuite/ modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/ modules/kernel/src/org/apache
Author: veithen Date: Sun Aug 22 15:58:06 2010 New Revision: 987922 URL: http://svn.apache.org/viewvc?rev=987922&view=rev Log: Merged r986944 back to the trunk (maven-release-plugin can only be tested on the 1.5 branch for the moment). Modified: axis/axis2/java/core/trunk/ (props changed) axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/attribute.xsd (props changed) axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd (props changed) axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/ (props changed) axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/ (props changed) axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java (props changed) axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java (props changed) axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java (props changed) axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java (props changed) axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java (props changed) axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java (props changed) axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java (props changed) axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/package-info.java (props changed) axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/trunk/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/trunk/modules/transport/http/src/ (props changed) axis/axis2/java/core/trunk/modules/transport/local/ (props changed) axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/ (props changed) axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/ (props changed) axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java (props changed) axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) axis/axis2/java/core/trunk/pom.xml Propchange: axis/axis2/java/core/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 22 15:58:06 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/branches/java/1_5:966825 +/axis/axis2/java/core/branches/java/1_5:966825,986944 /webservices/axis2/branches/java/1_5:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/attribute.xsd -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 22 15:58:06 2010 @@ -1 +1 @@ -/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test-resources/testsuite/attribute.xsd:966825 +/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test-resources/testsuite/attribute.xsd:966825,986944 Propchange: axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 22 15:58:06 2010 @@ -1 +1 @@ -/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd:966825 +/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd:966825,986944 Propchange: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 22 15:58:06 2010 @@ -1 +1 @@ -/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs:966825 +/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs:966825,986944 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 22 15:58:06 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/branches/
svn commit: r987928 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen Date: Sun Aug 22 17:21:18 2010 New Revision: 987928 URL: http://svn.apache.org/viewvc?rev=987928&view=rev Log: Eliminated the old snapshot repository (on people.apache.org; all snapshot dependencies are now available at repository.apache.org) as well as ws.zones.apache.org. The OpenSAML 1.1 release is available from Maven central, although with a different groupId/artifactId. Modified: axis/axis2/java/rampart/trunk/pom.xml Modified: axis/axis2/java/rampart/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=987928&r1=987927&r2=987928&view=diff == --- axis/axis2/java/rampart/trunk/pom.xml (original) +++ axis/axis2/java/rampart/trunk/pom.xml Sun Aug 22 17:21:18 2010 @@ -94,39 +94,6 @@ - - -false -always -warn - - -true -never -fail - -apache-snapshots -Apache Maven2 SNAPSHOTS -http://people.apache.org/repo/m2-snapshot-repository -default - - - - -true -always -warn - - -true -never -warn - -apache-ws-zones2 -Apache ws.zones - 2 -http://ws.zones.apache.org/repository2 - - true @@ -252,8 +219,8 @@ ${xmlsec.version} -opensaml -opensaml +org.opensaml +opensaml1 1.1
svn commit: r987935 - /axis/axis2/java/core/trunk/modules/parent/pom.xml
Author: veithen Date: Sun Aug 22 17:59:08 2010 New Revision: 987935 URL: http://svn.apache.org/viewvc?rev=987935&view=rev Log: Removed unnecessary repository. Tomcat artifacts (for the version we are using) are available from Maven central. Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=987935&r1=987934&r2=987935&view=diff == --- axis/axis2/java/core/trunk/modules/parent/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sun Aug 22 17:59:08 2010 @@ -442,17 +442,6 @@ which is what we want. --> -tomcat-repository -http://tomcat.apache.org/dev/dist/m2-repository - -true -never - - -false - - - eclipse-repo eclipse maven repository http://repo1.maven.org/eclipse
svn commit: r987944 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/
Author: veithen Date: Sun Aug 22 19:37:30 2010 New Revision: 987944 URL: http://svn.apache.org/viewvc?rev=987944&view=rev Log: Merged r987935 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/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/parent/pom.xml 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) Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 22 19:37:30 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 +/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 /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,816891,834058,834175,904660,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 22 19:37:30 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 +/axis/axis2/java/core/trunk/modules/distribution:922914,922941,9