Author: veithen
Date: Thu Sep 9 19:54:53 2010
New Revision: 995560
URL: http://svn.apache.org/viewvc?rev=995560&view=rev
Log:
Merged r902271 (with changes) to the 1.5 branch. This removes support for
servlet API versions <= 2.2 (i.e. Tomcat 3). This also avoids getting error
messages such as 'Old Servlet API :java.lang.StackOverflowError' in case of
Axis2 configuration problems.
Modified:
axis/axis2/java/core/branches/1_5/ (props changed)
axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed)
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props
changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props
changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
(props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
(props changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props
changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/CustomListener.java
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/ListingAgent.java
axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed)
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
-/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,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980
+/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,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
-/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,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980
+/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,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,902271,904660,904780,905980
Propchange:
axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,902271,904660,904780,905980
Propchange:
axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
-/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,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980
+/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,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/module:922983,965032,965056,966401,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449
-/webservices/axis2/trunk/java/modules/soapmonitor/module:795431,816804,816812
+/webservices/axis2/trunk/java/modules/soapmonitor/module:795431,816804,816812,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
/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:795431,807160,816804,816812
+/webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml:795431,807160,816804,816812,902271
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
/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,795431,807160,816804,816812
+/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:777648,795431,807160,816804,816812,902271
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
/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:795431,807160,816804,816812
+/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:795431,807160,816804,816812,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/soapmonitor/servlet:922914,965032,965056,965213,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449
-/webservices/axis2/trunk/java/modules/soapmonitor/servlet:795431,816804,816812
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet:795431,816804,816812,902271
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
/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,795431,807160,816804,816812
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:777648,795431,807160,816804,816812,902271
Propchange:
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
/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,795431,807160,816804,816812
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:777648,795431,807160,816804,816812,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
-/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,902271,904660,904780,905980
Modified:
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java?rev=995560&r1=995559&r2=995560&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
(original)
+++
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
Thu Sep 9 19:54:53 2010
@@ -117,12 +117,8 @@ public class AbstractAgent {
HttpServletResponse httpServletResponse)
throws IOException, ServletException {
httpServletResponse.setContentType("text/html");
- try {
-
httpServletRequest.getRequestDispatcher(Constants.AXIS_WEB_CONTENT_ROOT +
jspName)
- .include(httpServletRequest, httpServletResponse);
- } catch (Throwable t) {
- log.info("Old Servlet API :" + t);
- }
+
httpServletRequest.getRequestDispatcher(Constants.AXIS_WEB_CONTENT_ROOT +
jspName)
+ .include(httpServletRequest, httpServletResponse);
}
private void preloadMethods() {
@@ -158,11 +154,7 @@ public class AbstractAgent {
protected void populateSessionInformation(HttpServletRequest req) {
HashMap services = configContext.getAxisConfiguration().getServices();
- try {
- req.getSession().setAttribute(Constants.SERVICE_MAP, services);
- req.getSession().setAttribute(Constants.SERVICE_PATH,
configContext.getServicePath());
- } catch (Throwable t){
- log.info("Old Servlet API :" + t);
- }
+ req.getSession().setAttribute(Constants.SERVICE_MAP, services);
+ req.getSession().setAttribute(Constants.SERVICE_PATH,
configContext.getServicePath());
}
}
Modified:
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java?rev=995560&r1=995559&r2=995560&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
(original)
+++
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
Thu Sep 9 19:54:53 2010
@@ -115,11 +115,7 @@ public class AxisServlet extends HttpSer
protected void doPost(HttpServletRequest request, HttpServletResponse
response)
throws ServletException, IOException {
//set the initial buffer for a larger value
- try {
response.setBufferSize(BUFFER_SIZE);
- } catch (Throwable t){
- log.info("Old Servlet API :" + t);
- }
initContextRoot(request);
@@ -131,13 +127,7 @@ public class AxisServlet extends HttpSer
msgContext.setProperty(Constants.Configuration.CONTENT_TYPE,
contentType);
try {
// adding ServletContext into msgContext;
- String url;
- try {
- url = request.getRequestURL().toString();
- } catch (Throwable t){
- log.info("Old Servlet API (fallback to
HttpServletRequest.getRequestURI) :" + t);
- url = request.getRequestURI();
- }
+ String url = request.getRequestURL().toString();
InvocationResponse pi = HTTPTransportUtils.
processHTTPPostRequest(msgContext,
@@ -542,14 +532,7 @@ public class AxisServlet extends HttpSer
if (contextRoot != null && contextRoot.trim().length() != 0) {
return;
}
- String contextPath = null;
- // Support older servlet API's
- try {
- contextPath = req.getContextPath();
- } catch (Throwable t) {
- log.info("Old Servlet API (Fallback to
HttpServletRequest.getServletPath) :" + t);
- contextPath = req.getServletPath();
- }
+ String contextPath = req.getContextPath();
//handling ROOT scenario, for servlets in the default (root) context,
this method returns ""
if (contextPath != null && contextPath.length() == 0) {
contextPath = "/";
@@ -635,16 +618,8 @@ public class AxisServlet extends HttpSer
MessageContext msgContext = configContext.createMessageContext();
String requestURI = request.getRequestURI();
- String trsPrefix = null;
- int sepindex = -1;
- // Support older servlet API's
- try {
- trsPrefix = request.getRequestURL().toString();
- } catch (Throwable t){
- log.info("Old Servlet API (Fallback to
HttpServletRequest.getRequestURI) :" + t);
- trsPrefix = request.getRequestURI();
- }
- sepindex = trsPrefix.indexOf(':');
+ String trsPrefix = request.getRequestURL().toString();
+ int sepindex = trsPrefix.indexOf(':');
if (sepindex > -1) {
trsPrefix = trsPrefix.substring(0, sepindex);
msgContext.setIncomingTransportName(trsPrefix);
Modified:
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/CustomListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/CustomListener.java?rev=995560&r1=995559&r2=995560&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/CustomListener.java
(original)
+++
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/CustomListener.java
Thu Sep 9 19:54:53 2010
@@ -84,19 +84,13 @@ public class CustomListener implements T
SessionContext sessionContext =
(SessionContext) req.getSession(true).getAttribute(
Constants.SESSION_CONTEXT_PROPERTY);
- String sessionId = null;
- try {
- sessionId = req.getSession().getId();
- if (sessionContext == null) {
+ String sessionId = req.getSession().getId();
+ if (sessionContext == null) {
sessionContext = new SessionContext(null);
sessionContext.setCookieID(sessionId);
req.getSession().setAttribute(Constants.SESSION_CONTEXT_PROPERTY,
sessionContext);
}
- } catch (Throwable t){
- log.info("Old Servlet API :" + t);
- return null;
- }
messageContext.setSessionContext(sessionContext);
messageContext.setProperty(AxisServlet.SESSION_ID, sessionId);
return sessionContext;
Modified:
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/ListingAgent.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/ListingAgent.java?rev=995560&r1=995559&r2=995560&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/ListingAgent.java
(original)
+++
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/ListingAgent.java
Thu Sep 9 19:54:53 2010
@@ -102,13 +102,7 @@ public class ListingAgent extends Abstra
protected void initTransportListener(HttpServletRequest
httpServletRequest) {
// httpServletRequest.getLocalPort() , giving me a build error so I
had to use the followin
- String filePart;
- try {
- filePart = httpServletRequest.getRequestURL().toString();
- } catch (Throwable t){
- log.info("Old Servlet API (fallback to
HttpServletRequest.getRequestURI) :" + t);
- filePart = httpServletRequest.getRequestURI();
- }
+ String filePart = httpServletRequest.getRequestURL().toString();
int ipindex = filePart.indexOf("//");
String ip;
if (ipindex >= 0) {
@@ -134,11 +128,7 @@ public class ListingAgent extends Abstra
String serviceName = req.getParameter("serviceName");
if (serviceName != null) {
AxisService service =
configContext.getAxisConfiguration().getService(serviceName);
- try {
- req.getSession().setAttribute(Constants.SINGLE_SERVICE,
service);
- } catch (Throwable t) {
- log.info("Old Servlet API :" + t);
- }
+ req.getSession().setAttribute(Constants.SINGLE_SERVICE, service);
}
renderView(LIST_FAULTY_SERVICES_JSP_NAME, req, res);
}
@@ -224,13 +214,7 @@ public class ListingAgent extends Abstra
HttpServletResponse res)
throws IOException, ServletException {
- String url;
- try {
- url = req.getRequestURL().toString();
- } catch (Throwable t) {
- log.info("Old Servlet API (Fallback to
HttpServletRequest.getRequestURI) :" + t);
- url = req.getRequestURI();
- }
+ String url = req.getRequestURL().toString();
String serviceName = extractServiceName(url);
HashMap services = configContext.getAxisConfiguration().getServices();
String query = req.getQueryString();
@@ -369,19 +353,11 @@ public class ListingAgent extends Abstra
return;
} else {
- try {
- req.getSession().setAttribute(Constants.SINGLE_SERVICE,
- serviceObj);
- } catch (Throwable t) {
- log.info("Old Servlet API :" + t);
- }
+ req.getSession().setAttribute(Constants.SINGLE_SERVICE,
+ serviceObj);
}
} else {
- try {
- req.getSession().setAttribute(Constants.SINGLE_SERVICE,
null);
- } catch (Throwable t){
- log.info("Old Servlet API :" + t);
- }
+ req.getSession().setAttribute(Constants.SINGLE_SERVICE, null);
res.sendError(HttpServletResponse.SC_NOT_FOUND, url);
}
@@ -395,12 +371,8 @@ public class ListingAgent extends Abstra
throws IOException, ServletException {
populateSessionInformation(req);
- try {
- req.getSession().setAttribute(Constants.ERROR_SERVICE_MAP,
-
configContext.getAxisConfiguration().getFaultyServices());
- } catch (Throwable t){
- log.info("Old Servlet API :" + t);
- }
+ req.getSession().setAttribute(Constants.ERROR_SERVICE_MAP,
+
configContext.getAxisConfiguration().getFaultyServices());
renderView(LIST_MULTIPLE_SERVICE_JSP_NAME, req, res);
}
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
-/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,902271,904660,904780,905980
Propchange:
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,902271,904660,904780,905980
Propchange:
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 9 19:54:53 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,990369,990377,990384,990394,990398,990404,990434,990449
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,904660,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777648,777882,777897,777934,783479,795431,801630,803725,805981,805999,807160,807487,816740,816804,816812,816891,834058,834175,902271,904660,904780,905980
