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/09/26 16:10:31 UTC
svn commit: r1001433 - in /axis/axis2/java/core/branches/1_5: ./
modules/distribution/
modules/kernel/src/org/apache/axis2/transport/http/util/
modules/kernel/test/org/apache/axis2/transport/http/util/ modules/parent/
modules/soapmonitor/module/ module...
Author: veithen
Date: Sun Sep 26 14:10:30 2010
New Revision: 1001433
URL: http://svn.apache.org/viewvc?rev=1001433&view=rev
Log:
Fixed AXIS2-4465 on the 1.5 branch as requested by Raghu Upadhyayula:
* Temporarily reverted r995560 (merge of r902271).
* Merged prerequisites for AXIS2-4465: r778060, r780546 (AXIS2-3843).
* Merged changes for AXIS2-4465: r805578, r806085, r806331, r807512, r821686, r821689.
* Remerged r902271.
Added:
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java
- copied, changed from r805578, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java
axis/axis2/java/core/branches/1_5/modules/webapp/conf/axis2.xml
- copied unchanged from r821689, webservices/axis2/trunk/java/modules/webapp/conf/axis2.xml
Removed:
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/CustomListener.java
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/AxisServlet.java
axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.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/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed)
axis/axis2/java/core/branches/1_5/modules/webapp/pom.xml
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 Sun Sep 26 14:10: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,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,902271,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,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10: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,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,902271,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,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,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 Sun Sep 26 14:10:30 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,902271,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,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,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 Sun Sep 26 14:10:30 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,902271,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,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10:30 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,902271,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,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10:30 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,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module:778060,780546,795431,805578,806085,806331,807512,816804,816812,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10:30 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,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module/pom.xml:778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10:30 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,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10:30 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,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10:30 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,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet:778060,780546,795431,805578,806085,806331,807512,816804,816812,821686,821689,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 Sun Sep 26 14:10:30 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,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,821686,821689,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 Sun Sep 26 14:10:30 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,902271
+/webservices/axis2/trunk/java/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,821686,821689,902271
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10:30 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,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,834058,834175,902271,904660,904780,905980
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10:30 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,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,834058,834175,902271,904660,904780,905980
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=1001433&r1=1001432&r2=1001433&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 Sun Sep 26 14:10:30 2010
@@ -32,7 +32,6 @@ import org.apache.axis2.addressing.Endpo
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.SessionContext;
import org.apache.axis2.deployment.WarBasedAxisConfigurator;
import org.apache.axis2.description.AxisBindingMessage;
import org.apache.axis2.description.AxisBindingOperation;
@@ -47,12 +46,10 @@ import org.apache.axis2.engine.ListenerM
import org.apache.axis2.transport.RequestResponseTransport;
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.server.HttpUtils;
import org.apache.axis2.transport.http.util.QueryStringParser;
import org.apache.axis2.transport.http.util.RESTUtil;
import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.MessageContextBuilder;
-import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -76,9 +73,19 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
/**
- * Class AxisServlet
+ * Servlet implementing the HTTP and HTTPS transport. Note that this class doesn't implement
+ * {@link TransportListener}. There are two reasons for this:
+ * <ul>
+ * <li>There must be one instance of {@link TransportListener} for each protocol, but this servlet
+ * may implement both HTTP and HTTPS.
+ * <li>There is a collision between {@link TransportListener#destroy()} and
+ * {@link javax.servlet.Servlet#destroy()}.
+ * </ul>
+ * The {@link TransportListener} implementation is provided by {@link AxisServletListener}. An
+ * instance of that class must be declared in <tt>axis2.xml</tt> for each protocol (HTTP/HTTPS) that
+ * the servlet should accept.
*/
-public class AxisServlet extends HttpServlet implements TransportListener {
+public class AxisServlet extends HttpServlet {
private static final Log log = LogFactory.getLog(AxisServlet.class);
public static final String CONFIGURATION_CONTEXT = "CONFIGURATION_CONTEXT";
@@ -103,6 +110,9 @@ public class AxisServlet extends HttpSer
private static final int BUFFER_SIZE = 1024 * 8;
private boolean initCalled = false;
+
+ private transient AxisServletListener httpListener;
+ private transient AxisServletListener httpsListener;
/**
* Implementaion of POST interface
@@ -117,7 +127,7 @@ public class AxisServlet extends HttpSer
//set the initial buffer for a larger value
response.setBufferSize(BUFFER_SIZE);
- initContextRoot(request);
+ preprocessRequest(request);
MessageContext msgContext;
OutputStream out = response.getOutputStream();
@@ -222,7 +232,7 @@ public class AxisServlet extends HttpSer
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
- initContextRoot(request);
+ preprocessRequest(request);
// this method is also used to serve for the listServices request.
@@ -235,7 +245,6 @@ public class AxisServlet extends HttpSer
// 3. REST requests.
if ((query != null) && new QueryStringParser(query).search(metadataQueryParamNames)) {
// handling meta data exchange stuff
- agent.initTransportListener(request);
agent.processListService(request, response);
} else if (requestURI.endsWith(".xsd") ||
requestURI.endsWith(".wsdl")) {
@@ -268,7 +277,7 @@ public class AxisServlet extends HttpSer
protected void doDelete(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
- initContextRoot(request);
+ preprocessRequest(request);
// this method is also used to serve for the listServices request.
if (!disableREST) {
new RestRequestProcessor(Constants.Configuration.HTTP_METHOD_DELETE, request, response)
@@ -289,7 +298,7 @@ public class AxisServlet extends HttpSer
protected void doPut(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
- initContextRoot(request);
+ preprocessRequest(request);
// this method is also used to serve for the listServices request.
if (!disableREST) {
new RestRequestProcessor(Constants.Configuration.HTTP_METHOD_PUT, request, response)
@@ -435,12 +444,28 @@ public class AxisServlet extends HttpSer
}
axisConfiguration = configContext.getAxisConfiguration();
+ httpListener = getAxisServletListener(Constants.TRANSPORT_HTTP);
+ httpsListener = getAxisServletListener(Constants.TRANSPORT_HTTPS);
+
+ if (httpListener == null && httpsListener == null) {
+ log.warn("No transportReceiver for " + AxisServletListener.class.getName() +
+ " found. An instance for HTTP will be configured automatically. " +
+ "Please update your axis2.xml file!");
+ httpListener = new AxisServletListener();
+ TransportInDescription transportInDescription = new TransportInDescription(
+ Constants.TRANSPORT_HTTP);
+ transportInDescription.setReceiver(httpListener);
+ axisConfiguration.addTransportIn(transportInDescription);
+ } else if (httpListener != null && httpsListener != null
+ && httpListener.getPort() == -1 && httpsListener.getPort() == -1) {
+ log.warn("If more than one transportReceiver for " +
+ AxisServletListener.class.getName() + " exists, then all instances " +
+ "must be configured with a port number. WSDL generation will be " +
+ "unreliable.");
+ }
+
ListenerManager listenerManager = new ListenerManager();
listenerManager.init(configContext);
- TransportInDescription transportInDescription = new TransportInDescription(
- Constants.TRANSPORT_HTTP);
- transportInDescription.setReceiver(this);
- listenerManager.addListener(transportInDescription, true);
listenerManager.start();
ListenerManager.defaultConfigurationContext = configContext;
agent = new ListingAgent(configContext);
@@ -451,6 +476,19 @@ public class AxisServlet extends HttpSer
throw new ServletException(e);
}
}
+
+ private AxisServletListener getAxisServletListener(String name) {
+ TransportInDescription desc = axisConfiguration.getTransportIn(name);
+ if (desc == null) {
+ return null;
+ }
+ TransportListener receiver = desc.getReceiver();
+ if (receiver instanceof AxisServletListener) {
+ return (AxisServletListener)receiver;
+ } else {
+ return null;
+ }
+ }
/**
* distroy the ConfigurationContext
@@ -541,67 +579,51 @@ public class AxisServlet extends HttpSer
configContext.setContextRoot(contextRoot);
}
-
+
/**
- * Get all transport headers.
- *
- * @param req
- * @return Map
- */
- protected Map getTransportHeaders(HttpServletRequest req) {
- return new TransportHeaders(req);
- }
+ * Preprocess the request. This will:
+ * <ul>
+ * <li>Set the context root if it is not set already (by calling
+ * {@link #initContextRoot(HttpServletRequest)}).
+ * <li>Remember the port number if port autodetection is enabled.
+ * <li>Reject the request if no {@link AxisServletListener} has been registered for the
+ * protocol.
+ * </ul>
+ *
+ * @param req the request to preprocess
+ */
+ // This method should not be part of the public API. In particular we must not allow subclasses
+ // to override this method because we don't make any guarantees as to when exactly this method
+ // is called.
+ private void preprocessRequest(HttpServletRequest req) throws ServletException {
+ initContextRoot(req);
+
+ TransportInDescription transportInDescription =
+ req.isSecure()? this.axisConfiguration.getTransportIn(Constants.TRANSPORT_HTTPS) :
+ this.axisConfiguration.getTransportIn(Constants.TRANSPORT_HTTP);
-
- public EndpointReference getEPRForService(String serviceName, String ip) throws AxisFault {
- return getEPRsForService(serviceName, ip)[0];
- }
-
- public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault {
- //RUNNING_PORT
- String port = (String) configContext.getProperty(ListingAgent.RUNNING_PORT);
- if (port == null) {
- port = "8080";
- }
- if (ip == null) {
- try {
- ip = Utils.getIpAddress(axisConfiguration);
- if (ip == null) {
- ip = "localhost";
+ if (transportInDescription == null){
+ throw new ServletException(req.getScheme() + " is forbidden");
+ } else {
+ if (transportInDescription.getReceiver() instanceof AxisServletListener){
+ AxisServletListener listner = (AxisServletListener) transportInDescription.getReceiver();
+ // Autodetect the port number if necessary
+ if (listner.getPort() == -1){
+ listner.setPort(req.getServerPort());
}
- } catch (SocketException e) {
- throw AxisFault.makeFault(e);
}
}
-
- String endpointRefernce = "http://" + ip + ":" + port;
- if (configContext.getServiceContextPath().startsWith("/")) {
- endpointRefernce = endpointRefernce +
- configContext.getServiceContextPath() + "/" + serviceName;
- } else {
- endpointRefernce = endpointRefernce + '/' +
- configContext.getServiceContextPath() + "/" + serviceName;
- }
- EndpointReference endpoint = new EndpointReference(endpointRefernce + "/");
-
- return new EndpointReference[]{endpoint};
+
}
/**
- * init(); start() and stop() wouldn't do anything.
+ * Get all transport headers.
*
- * @param axisConf
- * @param transprtIn
- * @throws AxisFault
+ * @param req
+ * @return Map
*/
- public void init(ConfigurationContext axisConf,
- TransportInDescription transprtIn) throws AxisFault {
- }
-
- public void start() throws AxisFault {
- }
-
- public void stop() throws AxisFault {
+ protected Map getTransportHeaders(HttpServletRequest req) {
+ return new TransportHeaders(req);
}
/**
@@ -688,30 +710,6 @@ public class AxisServlet extends HttpSer
return createMessageContext(req, resp, true);
}
- /**
- * Transport session management.
- *
- * @param messageContext
- * @return SessionContext
- */
- public SessionContext getSessionContext(MessageContext messageContext) {
- HttpServletRequest req = (HttpServletRequest) messageContext.getProperty(
- HTTPConstants.MC_HTTP_SERVLETREQUEST);
- SessionContext sessionContext =
- (SessionContext) req.getSession(true).getAttribute(
- Constants.SESSION_CONTEXT_PROPERTY);
- String sessionId = req.getSession().getId();
- if (sessionContext == null) {
- sessionContext = new SessionContext(null);
- sessionContext.setCookieID(sessionId);
- req.getSession().setAttribute(Constants.SESSION_CONTEXT_PROPERTY,
- sessionContext);
- }
- messageContext.setSessionContext(sessionContext);
- messageContext.setProperty(SESSION_ID, sessionId);
- return sessionContext;
- }
-
protected class ServletRequestResponseTransport implements RequestResponseTransport {
private HttpServletResponse response;
private boolean responseWritten = false;
Copied: axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java (from r805578, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java)
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java?p2=axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java&p1=webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java&r1=805578&r2=1001433&rev=1001433&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java Sun Sep 26 14:10:30 2010
@@ -107,19 +107,13 @@ public class AxisServletListener impleme
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/HTTPTransportUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=1001433&r1=1001432&r2=1001433&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Sun Sep 26 14:10:30 2010
@@ -39,23 +39,29 @@ import org.apache.axis2.context.MessageC
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.engine.Handler.InvocationResponse;
+import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.TransportUtils;
import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.SocketException;
import java.util.Iterator;
import java.util.Map;
import java.util.zip.GZIPInputStream;
public class HTTPTransportUtils {
-
+ private static final Log log = LogFactory.getLog(HTTPTransportUtils.class);
/**
* @deprecated This was used only by the now deprecated processHTTPGetRequest() method.
@@ -273,4 +279,65 @@ public class HTTPTransportUtils {
contentType.indexOf(HTTPConstants.MEDIA_TYPE_X_WWW_FORM) > -1 ||
contentType.indexOf(HTTPConstants.MEDIA_TYPE_MULTIPART_FORM_DATA) > -1);
}
+
+ public static EndpointReference[] getEPRsForService(ConfigurationContext configurationContext,
+ TransportInDescription trpInDesc, String serviceName, String ip, int port) throws AxisFault {
+
+ AxisConfiguration axisConfiguration = configurationContext.getAxisConfiguration();
+ Parameter param = axisConfiguration.getParameter(Constants.HTTP_FRONTEND_HOST_URL);
+ StringBuilder epr = new StringBuilder();
+ if (param != null) {
+ epr.append(param.getValue());
+ String servicePath = configurationContext.getServicePath();
+ if (epr.charAt(epr.length()-1) != '/' && !servicePath.startsWith("/")) {
+ epr.append('/');
+ }
+ epr.append(servicePath);
+ } else {
+ param = trpInDesc.getParameter(TransportListener.HOST_ADDRESS);
+ if (param != null) {
+ // TODO: Need to decide if we really want to deprecate this parameter.
+ // Reason to deprecate it is that it has a misleading name ("hostname"
+ // while it is actually a URL), that its role overlaps with that
+ // of the "httpFrontendHostUrl" parameter in the Axis configuration and
+ // that there might be a confusion with the "hostname" parameter in the
+ // Axis configuration (which has a different meaning).
+ // If we deprecate it, we need to remove it from all the axis2.xml sample
+ // files. Note that the same parameter seems to be used by the TCP transport,
+ // but it's role is not very clear (since TCP has no concept of request URI).
+ log.warn("Transport '" + trpInDesc.getName()
+ + "' is configured with deprecated parameter '"
+ + TransportListener.HOST_ADDRESS + "'. Please set '"
+ + Constants.HTTP_FRONTEND_HOST_URL
+ + "' in the Axis configuration instead.");
+ epr.append(param.getValue());
+ } else {
+ if (ip == null){
+ try {
+ ip = Utils.getIpAddress(configurationContext.getAxisConfiguration());
+ } catch (SocketException ex) {
+ AxisFault.makeFault(ex);
+ }
+ }
+ String scheme = trpInDesc.getName();
+ epr.append(scheme);
+ epr.append("://");
+ epr.append(ip);
+ if (!(scheme.equals("http") && port == 80
+ || scheme.equals("https") && port == 443)) {
+ epr.append(':');
+ epr.append(port);
+ }
+ }
+ String serviceContextPath = configurationContext.getServiceContextPath();
+ if (epr.charAt(epr.length()-1) != '/' && !serviceContextPath.startsWith("/")) {
+ epr.append('/');
+ }
+ epr.append(serviceContextPath);
+ }
+ epr.append('/');
+ epr.append(serviceName);
+ epr.append('/');
+ return new EndpointReference[]{new EndpointReference(epr.toString())};
+ }
}
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=1001433&r1=1001432&r2=1001433&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 Sun Sep 26 14:10:30 2010
@@ -20,14 +20,11 @@
package org.apache.axis2.transport.http;
-import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.PolicyInclude;
-import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.util.ExternalPolicySerializer;
import org.apache.axis2.util.IOUtils;
import org.apache.commons.logging.Log;
@@ -59,34 +56,14 @@ public class ListingAgent extends Abstra
"listSingleService.jsp";
private static final String LIST_FAULTY_SERVICES_JSP_NAME = "listFaultyService.jsp";
- public static final String RUNNING_PORT = "RUNNING_PORT";
-
public ListingAgent(ConfigurationContext aConfigContext) {
super(aConfigContext);
}
- private void addTransportListener(String schema, int port) {
- try {
- TransportInDescription trsIn =
- configContext.getAxisConfiguration().getTransportIn(schema);
- if (trsIn == null) {
- trsIn = new TransportInDescription(schema);
- CustomListener httspReceiver = new CustomListener(port, schema);
- httspReceiver.init(configContext, trsIn);
- trsIn.setReceiver(httspReceiver);
- configContext.getListenerManager().addListener(trsIn, true);
- }
- } catch (AxisFault axisFault) {
- //
- }
- }
-
public void handle(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse)
throws IOException, ServletException {
- initTransportListener(httpServletRequest);
-
String query = httpServletRequest.getQueryString();
if (query != null) {
if (query.indexOf("wsdl2") > 0 || query.indexOf("wsdl") > 0 ||
@@ -100,29 +77,6 @@ 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 = httpServletRequest.getRequestURL().toString();
- int ipindex = filePart.indexOf("//");
- String ip;
- if (ipindex >= 0) {
- ip = filePart.substring(ipindex + 2, filePart.length());
- int seperatorIndex = ip.indexOf(":");
- int slashIndex = ip.indexOf("/");
- String portstr;
- if (seperatorIndex >= 0) {
- portstr = ip.substring(seperatorIndex + 1, slashIndex);
- } else {
- portstr = "80";
- }
- try {
- addTransportListener(httpServletRequest.getScheme(), Integer.parseInt(portstr));
- } catch (NumberFormatException e) {
- log.debug(e.toString(), e);
- }
- }
- }
-
protected void processListFaultyServices(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String serviceName = req.getParameter("serviceName");
@@ -140,23 +94,17 @@ public class ListingAgent extends Abstra
processListServices(httpServletRequest, httpServletResponse);
}
- private String extractHostAndPort(String filePart, boolean isHttp) {
+ private String extractHost(String filePart) {
int ipindex = filePart.indexOf("//");
String ip = null;
if (ipindex >= 0) {
ip = filePart.substring(ipindex + 2, filePart.length());
int seperatorIndex = ip.indexOf(":");
int slashIndex = ip.indexOf("/");
- String port;
if (seperatorIndex >= 0) {
- port = ip.substring(seperatorIndex + 1, slashIndex);
ip = ip.substring(0, seperatorIndex);
} else {
ip = ip.substring(0, slashIndex);
- port = "80";
- }
- if (isHttp) {
- configContext.setProperty(RUNNING_PORT, port);
}
}
return ip;
@@ -227,10 +175,9 @@ public class ListingAgent extends Abstra
Object serviceObj = services.get(serviceName);
if (serviceObj != null) {
AxisService axisService = (AxisService) serviceObj;
- boolean isHttp = "http".equals(req.getScheme());
if (wsdl2 >= 0) {
res.setContentType("text/xml");
- String ip = extractHostAndPort(url, isHttp);
+ String ip = extractHost(url);
String wsdlName = req.getParameter("wsdl2");
int ret = axisService.printWSDL2(res.getOutputStream(), ip, wsdlName);
@@ -243,7 +190,7 @@ public class ListingAgent extends Abstra
} else if (wsdl >= 0) {
OutputStream out = res.getOutputStream();
res.setContentType("text/xml");
- String ip = extractHostAndPort(url, isHttp);
+ String ip = extractHost(url);
String wsdlName = req.getParameter("wsdl");
if (wsdlName != null && wsdlName.length()>0) {
Modified: axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=1001433&r1=1001432&r2=1001433&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ axis/axis2/java/core/branches/1_5/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Sun Sep 26 14:10:30 2010
@@ -32,18 +32,15 @@ import org.apache.axis2.description.Tran
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.http.server.HttpFactory;
-import org.apache.axis2.transport.http.server.HttpUtils;
import org.apache.axis2.transport.http.server.SessionManager;
import org.apache.axis2.transport.http.server.SimpleHttpServer;
import org.apache.axis2.util.OptionsParser;
-import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
import java.io.File;
import java.io.IOException;
-import java.net.SocketException;
import java.util.Iterator;
/**
@@ -60,14 +57,12 @@ public class SimpleHTTPServer implements
* Embedded commons http core based server
*/
SimpleHttpServer embedded = null;
- private String localAddress;
int port = -1;
public static int DEFAULT_PORT = 8080;
- private String hostAddress = null;
-
protected ConfigurationContext configurationContext;
+ private TransportInDescription trpInDesc;
protected HttpFactory httpFactory;
private SessionManager sessionManager;
@@ -91,6 +86,7 @@ public class SimpleHTTPServer implements
TransportInDescription httpDescription =
new TransportInDescription(Constants.TRANSPORT_HTTP);
httpDescription.setReceiver(this);
+ trpInDesc = httpDescription;
httpFactory.getListenerManager().addListener(httpDescription, true);
sessionManager = new SessionManager();
}
@@ -106,6 +102,7 @@ public class SimpleHTTPServer implements
throws AxisFault {
try {
this.configurationContext = axisConf;
+ this.trpInDesc = transprtIn;
Parameter param = transprtIn.getParameter(PARAM_PORT);
if (param != null) {
@@ -115,13 +112,6 @@ public class SimpleHTTPServer implements
if (httpFactory == null) {
httpFactory = new HttpFactory(configurationContext, port);
}
-
- param = transprtIn.getParameter(HOST_ADDRESS);
- if (param != null) {
- hostAddress = ((String) param.getValue()).trim();
- } else {
- hostAddress = httpFactory.getHostAddress();
- }
} catch (Exception e1) {
throw AxisFault.makeFault(e1);
}
@@ -248,55 +238,10 @@ public class SimpleHTTPServer implements
* @see org.apache.axis2.transport.TransportListener#getEPRForService(String,String)
*/
public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault {
- //if host address is present
- if (hostAddress != null) {
- if (embedded != null) {
- String endpointRefernce = hostAddress ;
- if(configurationContext.getServiceContextPath().startsWith("/")){
- endpointRefernce = endpointRefernce +
- configurationContext.getServiceContextPath() + "/" + serviceName;
- } else {
- endpointRefernce = endpointRefernce + '/' +
- configurationContext.getServiceContextPath() + "/" + serviceName;
- }
- return new EndpointReference[]{new EndpointReference(endpointRefernce + "/")};
- } else {
- throw new AxisFault("Unable to generate EPR for the transport : http");
- }
- }
- //if the host address is not present
- String ipAddress;
- if (ip != null) {
- ipAddress = ip;
- } else {
- try {
- if(localAddress==null){
- localAddress = Utils.getIpAddress(configurationContext.getAxisConfiguration());
- }
- if (localAddress == null) {
- ipAddress = "127.0.0.1";
- } else {
- ipAddress = localAddress;
- }
- } catch (SocketException e) {
- throw AxisFault.makeFault(e);
- }
- }
- if (embedded != null) {
- String endpointRefernce = "http://" + ipAddress + ":" + embedded.getPort() ;
- if(configurationContext.getServiceContextPath().startsWith("/")){
- endpointRefernce = endpointRefernce +
- configurationContext.getServiceContextPath() + "/" + serviceName;
- } else {
- endpointRefernce = endpointRefernce + '/' +
- configurationContext.getServiceContextPath() + "/" + serviceName;
- }
-
-
- return new EndpointReference[]{new EndpointReference(endpointRefernce + "/")};
- } else {
+ if (embedded == null) {
throw new AxisFault("Unable to generate EPR for the transport : http");
}
+ return HTTPTransportUtils.getEPRsForService(configurationContext, trpInDesc, serviceName, ip, embedded.getPort());
}
/**
Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10:30 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,902271,904660,904780,905980
+/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,834058,834175,902271,904660,904780,905980
Modified: axis/axis2/java/core/branches/1_5/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/webapp/pom.xml?rev=1001433&r1=1001432&r2=1001433&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/branches/1_5/modules/webapp/pom.xml Sun Sep 26 14:10:30 2010
@@ -262,7 +262,7 @@
<outputDirectory>${project.build.directory}/webResources/WEB-INF/conf</outputDirectory>
<resources>
<resource>
- <directory>../kernel/conf</directory>
+ <directory>conf</directory>
<includes>
<include>axis2.xml</include>
</includes>
Propchange: axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 26 14:10:30 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,902271,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,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,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 Sun Sep 26 14:10:30 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,902271,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,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,834058,834175,902271,904660,904780,905980