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/11/11 00:31:08 UTC

svn commit: r1033776 [1/2] - 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/saaj/test/org/apache...

Author: veithen
Date: Wed Nov 10 23:31:06 2010
New Revision: 1033776

URL: http://svn.apache.org/viewvc?rev=1033776&view=rev
Log:
Merged recent site changes (1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694) to the 1.5 branch. In particular, this includes fixes for AXIS2-4055 and AXIS2-4109.

Added:
    axis/axis2/java/core/branches/1_5/src/site/resources/images/axis.jpg
      - copied unchanged from r1032390, axis/axis2/java/core/trunk/src/site/resources/images/axis.jpg
Removed:
    axis/axis2/java/core/branches/1_5/src/site/resources/docs/images/axis.jpg
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/saaj/test/org/apache/axis2/saaj/TestUtils.java   (props changed)
    axis/axis2/java/core/branches/1_5/modules/samples/quickstart/README.txt
    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/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)
    axis/axis2/java/core/branches/1_5/src/site/resources/css/site.css
    axis/axis2/java/core/branches/1_5/src/site/site.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/archived_news.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/Axis2ArchitectureGuide.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/adv-userguide.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/axis2config.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/contents.xml.vm
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/dii.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/http-transport.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/mtom-guide.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/pojoguide.xml.vm
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/quickstartguide.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/rest-ws.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/servlet-transport.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/soapmonitor-module.xml.vm
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/spring.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/transport_howto.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/userguide-forfurtherstudy.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/xmlbased-server.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/download.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/faq.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/index.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/tools/eclipse/servicearchiver-plugin.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/tools/eclipse/wsdl2java-plugin.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/tools/idea/Idea_plug-in_userguide.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/tools/maven-plugins/maven-aar-plugin.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/tools/maven-plugins/maven-java2wsdl-plugin.xml
    axis/axis2/java/core/branches/1_5/src/site/xdoc/tools/maven-plugins/maven-wsdl2code-plugin.xml

Propchange: axis/axis2/java/core/branches/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /webservices/axis2/trunk/java:728674,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,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,817965,821686,821689,834058,834175,889783,902271,904660,904780,905980

Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922941,922983,935169,935174,935338,936434,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/distribution:922914,922941,922983,935169,935174,935338,936434,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /webservices/axis2/trunk/java/modules/distribution:728674,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,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,817965,821686,821689,834058,834175,889783,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 Wed Nov 10 23:31:06 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,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1
 032694
 /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,761709,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,889783,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 Wed Nov 10 23:31:06 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,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032
 681,1032694
 /webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,761709,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,889783,902271,904660,904780,905980

Propchange: axis/axis2/java/core/branches/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/parent:922914,922941,922983,935169,935174,935338,936434,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/parent:922914,922941,922983,935169,935174,935338,936434,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /webservices/axis2/trunk/java/modules/parent:728674,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,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,817965,821686,821689,834058,834175,889783,902271,904660,904780,905980

Propchange: axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:937004,980242,1001453-1001466,1001673,1029034,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:937004,980242,1001453-1001466,1001673,1029034,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /webservices/axis2/branches/java/1_5/modules/saaj/test/org/apache/axis2/saaj/TestConstants.java:745088,749052,749058,751161,751271,760467
 /webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:889783

Modified: axis/axis2/java/core/branches/1_5/modules/samples/quickstart/README.txt
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/samples/quickstart/README.txt?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/modules/samples/quickstart/README.txt (original)
+++ axis/axis2/java/core/branches/1_5/modules/samples/quickstart/README.txt Wed Nov 10 23:31:06 2010
@@ -8,7 +8,7 @@ source code kindly see this 'Axis2 Quick
 Introduction
 ============
 In this sample, we are deploying a POJO after writing a services.xml and
-creating an aar. We also test the gePrice and update methods using a browser.
+creating an aar. We also test the getPrice and update methods using a browser.
 
 Pre-Requisites
 ==============

Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module:922983,937004,965032,965056,966401,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/soapmonitor/module:922983,937004,965032,965056,966401,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /webservices/axis2/trunk/java/modules/soapmonitor/module:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,778060,780546,795431,805578,806085,806331,807512,816804,816812,817965,821686,821689,889783,902271

Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:922914,922983,937004,965032,965056,966401,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:922914,922983,937004,965032,965056,966401,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /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:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,889783,902271

Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:922914,922983,937004,965032,965056,966401,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:922914,922983,937004,965032,965056,966401,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /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:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,889783,902271

Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:922914,922983,937004,965032,965056,966401,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:922914,922983,937004,965032,965056,966401,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /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:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,889783,902271

Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/servlet:922914,937004,965032,965056,965213,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet:922914,937004,965032,965056,965213,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /webservices/axis2/trunk/java/modules/soapmonitor/servlet:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,778060,780546,795431,805578,806085,806331,807512,816804,816812,817965,821686,821689,889783,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 Wed Nov 10 23:31:06 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:922914,937004,965032,965056,965213,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet:922914,937004,965032,965056,965213,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /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:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,889783,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 Wed Nov 10 23:31:06 2010
@@ -1,3 +1,3 @@
-/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:922914,937004,965032,965056,965213,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet:922914,937004,965032,965056,965213,980242,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /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:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,777648,778060,780546,795431,805578,806085,806331,807160,807512,816804,816812,817965,821686,821689,889783,902271

Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /webservices/axis2/trunk/java/modules/transport/http/pom.xml:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,889783,902271,904660,904780,905980

Propchange: axis/axis2/java/core/branches/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /webservices/axis2/trunk/java/modules/transport/http/src:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,889783,902271,904660,904780,905980

Propchange: axis/axis2/java/core/branches/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 23:31:06 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/transport/local:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /webservices/axis2/trunk/java/modules/transport/local:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,889783,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 Wed Nov 10 23:31:06 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,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694
 /webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,761709,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,889783,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 Wed Nov 10 23:31:06 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,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,922983,935169,935174,935338,937004,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,980242,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,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,10326
 94
 /webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:728674,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,761068,761709,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,889783,902271,904660,904780,905980

Modified: axis/axis2/java/core/branches/1_5/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/resources/css/site.css?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/resources/css/site.css (original)
+++ axis/axis2/java/core/branches/1_5/src/site/resources/css/site.css Wed Nov 10 23:31:06 2010
@@ -50,11 +50,13 @@
     font-style: italic
 }
 
+/*
 .code {
     font-family: Courier New;
     font-size: 10pt;
     color: #800000
 }
+*/
 
 /*
 -----------------------------------------------------------------------
@@ -62,73 +64,139 @@ Generic element styles
 ----------------------------------------------------------------------- */
 body {
     color: #111;
-    font: 11px / 1.5 verdana, arial;
-    margin: 10;
+    font-family: "Trebuchet MS", Verdana, sans-serif;
+    font-size: 1em;
     padding: 5;
     border-width: 0;
     outline-width: 0;
     list-style-position: outside;
     display: block;
+
+    margin: 0 auto; /* center, not in IE5 */
+    height: auto !important; /* real browsers */
+    height: 100%; /* IE6: treaded as min-height*/
+
+    min-height: 100%; /* real browsers */
+    width: 980px;
 }
 
-p {
+#breadcrumbs {
+    font-size: 0.8em;
+    background-color: transparent;
+    border-top: 2px solid #6895c2;
+    border-bottom: 2px solid #6895c2;
 }
 
-a, a:link {
+.xleft, #bannerLeft img {
+    text-shadow: none;
+}
+
+.xright, #bannerRight {
+    text-shadow: none;
+}
+
+#leftColumn {
+    border: none;
+    background-color: transparent;
+    margin: 1em 0 0 0;
+}
+
+#navcolumn {
+    padding: 0;
+}
+
+#navcolumn h5 {
+    background-color: #e8f4ff;
+    border-left: solid 1px #ff2700;
+    border-bottom: none;
+    font-size: 0.9em;
+    padding: 5px;
+    color: #333333;
+    font-weight: normal;
+}
+
+#navcolumn li {
+    font-size: 0.9em;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+}
+
+#bodyColumn {
+    margin-left: 190px;
+    margin-right: 0;
+}
+
+#contentBox {
+    color: #333333;
+}
+
+#contentBox p, #contentBox td, #contentBox li {
+    font-family: "Trebuchet MS", Verdana, sans-serif;
+	line-height: 1.5em;
+    font-size: 0.94em;
+}
+
+#contentBox p, #contentBox li {
+    text-align: justify;
+}
+
+a:link {
     color: #039;
-    font-size: 11px;
 }
 
 a:hover {
     color: #03c;
-    font-size: 11px;
     text-decoration: none;
 }
 
-a:visited {
-    font-size: 11px; /* color: #969; */
-/* No need to discolour visited links as this is a system */
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+    background: none;
+    padding: 0;
 }
 
-ul, ol {
-    font-size: 11px;
-    text-align: left;
-    list-style-position: outside;
-    display: block;
-    white-space: normal;
+table.bodyTable th {
+    background-color: #6f8aa5;
 }
 
-table td {
-    font-size: 11px;
-    padding: 0px;
-    spacing: 0px;
-    text-align: left;
-    vertical-align: top;
+table.bodyTable tr.a {
+    background-color: #d1dce7;
+}
+
+table.bodyTable tr.b {
+    background-color: #eceef1;
 }
 
 h1 {
-    color: #000;
-    font-size: 16px;
-    font-weight: bold;
-    background-color: #dcdcdc;
-    padding-left: 10px;
+    color: #4f4f4f;
+    font-size: 2.5em;
+    font-weight: normal;
 }
 
 h2 {
-    font-size: 15px;
-    padding-left: 10px;
-    border-bottom: 1px solid #a9a9a9;
-    border-left-color: black;
+    color: #646b71;
+    font-size: 1.7em;
+    background-color: transparent;
+    border: none;
+    padding: 0;
+    font-weight: normal;
 }
 
 h3 {
-    font-size: 14px;
-    padding-left: 10px;
-    border-bottom: 1px solid #d3d3d3;
+    color: #7d858d;
+	font-weight: bold;
+    font-size: 1.2em;
+    background-color: transparent;
+    border: none;
+    padding: 0;
 }
 
 h4 {
-    font-size: 13px;
+    color: #333333;
+    font-size: 1em;
+    font-weight: bold;
+    background-color: transparent;
+    border: none;
+    padding: 0;
 }
 
 th {
@@ -150,4 +218,21 @@ table {
     background-repeat: no-repeat;
     background-attachment: scroll;
     background-position: left top;
-}
\ No newline at end of file
+}
+
+pre, div.source {
+    border: 1px dotted;
+    background-color: #e2ecf6;
+    padding: 0.8em;
+    margin: 0;
+    overflow: auto;
+    font-size: 0.9em;
+}
+
+/* Xdoc generates <div class="source"><pre>...</pre></div> for <source> elements.
+   Because we already apply styles to every <pre>, we need to suppress styles here. */
+div.source pre {
+    border: none;
+    background-color: transparent;
+    padding: none;
+}

Modified: axis/axis2/java/core/branches/1_5/src/site/site.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/site.xml?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/site.xml (original)
+++ axis/axis2/java/core/branches/1_5/src/site/site.xml Wed Nov 10 23:31:06 2010
@@ -29,16 +29,15 @@
     <bannerLeft>
         <name>Apache Axis2</name>
         <src>http://www.apache.org/images/asf_logo_wide.png</src>
-        <href>http://ws.apache.org/axis2/</href>
+        <href>http://www.apache.org/</href>
     </bannerLeft>
     <bannerRight>
-        <src>http://ws.apache.org/axis2/images/axis.jpg</src>
+        <src>http://axis.apache.org/axis2/java/core/images/axis.jpg</src>
+        <href>http://axis.apache.org/axis2/java/core/</href>
     </bannerRight>
     <body>
         <links>
             <item name="Axis2/Java" href="index.html" />
-            <item name="Axis2/C" href="http://ws.apache.org/axis2/c" />
-            <item name="Apache WS" href="http://ws.apache.org" />
             <item name="Apache    " href="http://www.apache.org" />
         </links>
 

Modified: axis/axis2/java/core/branches/1_5/src/site/xdoc/archived_news.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/xdoc/archived_news.xml?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/xdoc/archived_news.xml (original)
+++ axis/axis2/java/core/branches/1_5/src/site/xdoc/archived_news.xml Wed Nov 10 23:31:06 2010
@@ -466,7 +466,7 @@ WS-AtomicTransaction</a> - Supported by 
 included as part of Axis2 core</li>
 </ul>
 <p>Apache Axis2 is built on <a href=
-"http://ws.apache.org/commons/axiom/index.html">Apache Axiom</a>, a
+"http://ws.apache.org/axiom/">Apache Axiom</a>, a
 new high performant, pull-based XML object model that was released
 on 02 May 2006.</p>
 <h2>Features</h2>
@@ -515,16 +515,16 @@ Optimized Packaging (XOP) and SOAP with 
 <ol type="1">
 <li>Axis2 Web Application (Web App)</li>
 <li>WSDL2WS- <a href=
-"../tools/eclipse/wsdl2java-plugin.html">eclipse
+"tools/eclipse/wsdl2java-plugin.html">eclipse
 plug-in</a><a>/</a> <a href=
-"../tools/CodegenToolReference.html">Command line
+"tools/CodegenToolReference.html">Command line
 version</a><a>/</a><a href=
-"../tools/idea/Idea_plug-in_userguide.html#WSDL2Java_Code_Generation">IntelliJ
+"tools/idea/Idea_plug-in_userguide.html#WSDL2Java_Code_Generation">IntelliJ
 IDEA plug-in</a></li>
 <li>Service Archive Wizard- <a href=
-"../tools/eclipse/servicearchiver-plugin.html">eclipse
+"tools/eclipse/servicearchiver-plugin.html">eclipse
 plug-in</a>/ <a href=
-"../tools/idea/Idea_plug-in_userguide.html#Create_Service_Archive">
+"tools/idea/Idea_plug-in_userguide.html#Create_Service_Archive">
 IntelliJ IDEA plug-in</a></li>
 </ol>
 <h2>Extension Modules</h2>

Modified: axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/Axis2ArchitectureGuide.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/Axis2ArchitectureGuide.xml?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/Axis2ArchitectureGuide.xml (original)
+++ axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/Axis2ArchitectureGuide.xml Wed Nov 10 23:31:06 2010
@@ -198,7 +198,7 @@ of this is the single most important fac
 performance. It makes sense to delegate this task to a separate
 sub-project under the Web services project, allowing that
 sub-project (<a href=
-"http://ws.apache.org/commons/axiom/index.html">AXIOM</a> or AXis
+"http://ws.apache.org/axiom/">AXIOM</a> or AXis
 Object Model) to provide a simple API for SOAP and XML info-set. It
 hides the complexities of efficient XML processing within its
 implementation.</p>
@@ -396,7 +396,7 @@ particular message.</p>
 <h2>XML Processing Model</h2>
 <p>As mentioned above, the XML processing model of Axis2 has become
 a separate sub-project, called <a href=
-"http://ws.apache.org/commons/axiom/index.html">Apache Axiom</a>,
+"http://ws.apache.org/axiom/">Apache Axiom</a>,
 in the Apache Web services project. Please refer to the <a href=
 "OMTutorial.html">OM Tutorial</a> for more information.</p>
 <a name="bmSOAPPM" id="bmSOAPPM"></a>

Modified: axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/adv-userguide.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/adv-userguide.xml?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/adv-userguide.xml (original)
+++ axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/adv-userguide.xml Wed Nov 10 23:31:06 2010
@@ -140,15 +140,15 @@ directory has three operations: echoStri
 see how the others will look when they are filled up, see <a
 href="src/Axis2SampleDocLitServiceCode.html">Code Listing For
 Axis2SampleDocLitService Service</a></p>
-<source><pre>public org.apache.axis2.userguide.xsd.EchoStringReturnDocument 
+<pre>public org.apache.axis2.userguide.xsd.EchoStringReturnDocument 
     echoString(org.apache.axis2.userguide.xsd.EchoStringParamDocument param4) throws Exception {
     //Use the factory to create the output document.
     org.apache.axis2.userguide.xsd.EchoStringReturnDocument retDoc = 
            org.apache.axis2.userguide.xsd.EchoStringReturnDocument.Factory.newInstance();
     //send the string back.
     retDoc.setEchoStringReturn(param4.getEchoStringParam());
-   return retDoc;<br/></pre>
-</source><a name="Step4_Create_archive"></a>
+   return retDoc;</pre>
+<a name="Step4_Create_archive"></a>
 
 <h3>Step 3: Create Archive File</h3>
 
@@ -219,9 +219,8 @@ generation</strong> approach presented b
 <p>Let's see how we could generate java code (Stub) to handle the client side
 Web Service invocation for you. This can be done by running the WSDL2Java
 tool using the following arguments</p>
-<source><pre>wsdl2java.sh -uri ../samples/wsdl/Axis2SampleDocLit.wsdl -d xmlbeans 
+<pre>wsdl2java.sh -uri ../samples/wsdl/Axis2SampleDocLit.wsdl -d xmlbeans 
      -o ../samples/src -p org.apache.axis2.userguide</pre>
-</source>
 <p>This will generate client side stubs and xmlbeans types for your types.
 The Stub class that you need to use will be of the form
 <strong>&lt;service-name&gt;Stub</strong>. In our example, it will be called
@@ -243,7 +242,7 @@ strategies.</p>
 <code>Axis2SampleDocLitService</code> that we have already deployed. The code
 is extremely simple to understand and the explanations are in the form of
 comments.</p>
-<source><pre>     try {
+<pre>     try {
                org.apache.axis2.userguide.Axis2SampleDocLitServiceStub stub 
                   = new org.apache.axis2.userguide.Axis2SampleDocLitServiceStub(null,
                     "http://localhost:8080/axis2/services/Axis2SampleDocLitService");
@@ -258,7 +257,6 @@ comments.</p>
                } catch (java.rmi.RemoteException e) {
                   e.printStackTrace();
               }</pre>
-</source>
 <p>First argument of <code>Axis2SampleDocLitPortTypeStub</code> should be the
 Axis2 repository for the client. Here we use null to make the stub use
 default configurations. However, you can make Axis2 use your own repository
@@ -274,7 +272,7 @@ innovation. For each method in the Servi
 <strong>start&lt;method-name&gt;</strong>. These methods accept a callback
 object, which would be called when the response is received. Sample code that
 does an asynchronous interaction is given below.</p>
-<source><pre>try {
+<pre>try {
          org.apache.axis2.userguide.Axis2SampleDocLitServiceStub stub
            = new org.apache.axis2.userguide.Axis2SampleDocLitServiceStub(null,
              "http://localhost:8080/axis2/services/Axis2SampleDocLitService");
@@ -293,7 +291,6 @@ does an asynchronous interaction is give
         } catch (java.rmi.RemoteException e) {
           e.printStackTrace();
        }</pre>
-</source>
 <p>Even though the above code does a non-blocking invocation at the client
 API, the transport connection may still operate in a blocking fashion. For
 example, a single HTTP connection can be used to create a Web Service request
@@ -303,9 +300,8 @@ transport connections are used for the r
 the following code segment after creating the stub. It will force Axis2 to
 use two transport connections for the request and the response while the
 client uses a Callback to process the response.</p>
-<source><pre>stub._getServiceClient().engageModule(new QName("addressing"));
+<pre>stub._getServiceClient().engageModule(new QName("addressing"));
 stub._getServiceClient().getOptions().setUseSeparateListener(true);</pre>
-</source>
 <p>Once those options are set, Axis2 client does the following:</p>
 <ol>
   <li>Starts a new Transport Listener(Server) at the client side.</li>
@@ -321,7 +317,7 @@ stub._getServiceClient().getOptions().se
 
 <p>You can also use your own repository with an Axis2 Client.  The code below shows how
 to do this.</p>
-<source><pre>String axis2Repo = ...
+<pre>String axis2Repo = ...
 String axis2xml = ...
 ConfigurationContext configContext =
 ConfigurationContextFactory.createConfigurationContextFromFileSystem(axis2Repo, axis2xml);
@@ -329,7 +325,6 @@ Service1Stub stub1 = new Service1Stub(co
 //invoke Service1
 Service2Stub stub2 = new Service2Stub(configContext,...);
 //invoke Service2</pre>
-</source>
 <p>Note by creating the <code>ConfigurationContext</code> outside and passing
 it to the stubs, you could make number of stubs to use same repository, thus
 saving the configuration loading overhead from each request.</p>
@@ -399,7 +394,7 @@ the semantics of scope, and how to engag
         can be only engaged as global</td>
       <td>By adding a &lt;module ref="addressing"/&gt; to the Axis2 xml file
         or calling
-        <pre>stub._getServiceClient().engageModule(moduleName)</pre>
+        <code>stub._getServiceClient().engageModule(moduleName)</code>
         at client side</td>
     </tr>
     <tr>
@@ -446,7 +441,7 @@ and client sides.</p>
   <li>To <strong>engage</strong> the addressing module, you should either add
     &lt;module ref="addressing"/&gt; to the axis2.xml file at the client side
     or call
-    <pre>stub._getServiceClient().engageModule(moduleName)</pre>
+    <code>stub._getServiceClient().engageModule(moduleName)</code>
   </li>
 </ol>
 <a name="advanced"></a>

Modified: axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/axis2config.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/axis2config.xml?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/axis2config.xml (original)
+++ axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/axis2config.xml Wed Nov 10 23:31:06 2010
@@ -73,21 +73,18 @@ element) will be transformed into proper
 the top level parameters in the configuration document can be accessed via
 AxisConfiguration in the running system. The correct way of defining a
 parameter is shown below:</p>
-<source><pre> 
-  &lt;parameter name="name of the parameter" &gt;parameter value &lt;/parameter&gt;</pre>
-</source><a name="Receiver"></a>
+<pre>&lt;parameter name="name of the parameter" &gt;parameter value &lt;/parameter&gt;</pre>
+<a name="Receiver"></a>
 
 <h3>Transport Receiver</h3>
 
 <p>Depending on the underlying transport on which Axis2 is going to run, you
 need to have different transport receivers. The way you add them to the
-system is as follows:</p> <source>
-<pre>
-&lt;transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer"&gt;
-        &lt;parameter name="port" &gt;6060&lt;/parameter&gt;
- &lt;/transportReceiver&gt; 
- </pre>
-</source>The above elements show how to define transport receivers in
+system is as follows:</p>
+<pre>&lt;transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer"&gt;
+    &lt;parameter name="port" &gt;6060&lt;/parameter&gt;
+&lt;/transportReceiver&gt;</pre>
+The above elements show how to define transport receivers in
 axis2.xml. Here the "name" attribute of the &lt;transportReceiver/&gt; element identifies the
 type of the transport receiver. It can be HTTP, TCP, SMTP, CommonsHTTP, etc.
 When the system starts up or when you set the transport at the client side,
@@ -135,7 +132,7 @@ you want to add a handler that should go
 that by adding a handler element into it. In addition to that, there is no
 hard coding work for the handler chain anywhere in Axis2 (at any Axis*). So
 all those configurations are also done in the phase order element. The
-complete configurations will look as follows: </p><source>
+complete configurations will look as follows: </p>
 <pre>&lt;phaseOrder type="InFlow"&gt;
         &lt;!--   Global phases    --&gt;
          &lt;phase name="Transport"&gt;
@@ -215,7 +212,6 @@ complete configurations will look as fol
         &lt;phase name="PolicyDetermination"/&gt;
         &lt;phase name="MessageOut"/&gt;
     &lt;/phaseOrder&gt;</pre>
-</source>
 <p><strong>type:</strong> the attribute represents the type of the flow. It
 can only be one of the following:</p>
 <ul>
@@ -228,9 +224,8 @@ can only be one of the following:</p>
 <p>In addition to that, the only child element that is allowed inside
 "phaseOrder" is the "phase" element which represents the available phases in
 the execution chain. The method of specifying phases inside "phaseOrder" is
-as follows:</p><source>
-<pre> &lt;phase name="Transport"/&gt;</pre>
-</source>
+as follows:</p>
+<pre>&lt;phase name="Transport"/&gt;</pre>
 <p><strong>name:</strong> Name of the phase. <br/>
 </p>
 
@@ -264,9 +259,8 @@ phaseOrder:</p>
 <h3>Module References</h3>
 
 <p>If you want to engage a module, system wide, you can do it by adding a top
-level module element in axis2.xml. It should look as follows:</p><source>
-<pre>&lt;module ref="addressing"/&gt;  </pre>
-</source>
+level module element in axis2.xml. It should look as follows:</p>
+<pre>&lt;module ref="addressing"/&gt;</pre>
 <p><strong>ref:</strong> the module name which is going to be engaged, system
 wide.</p>
 <a name="Listeners"></a>
@@ -287,11 +281,10 @@ informed of the following events:</p>
 
 <p>Registering Observers is very useful for additional features such as RSS
 feed generation, which will provide service information to subscribers. The
-correct way of registering observers should as follows:</p><source>
+correct way of registering observers should as follows:</p>
 <pre>&lt;listener class="org.apache.axis2.ObserverIMPL"&gt;
     &lt;parameter name="RSS_URL" &gt;http://127.0.0.1/rss&lt;/parameter&gt;
-  &lt;/listener&gt;</pre>
-</source>
+&lt;/listener&gt;</pre>
 <p><strong>class:</strong> Represents an Implementation class of observer,
 and it should be noted that the Implementation class should implement
 AxisObserver interface, and the class has to be available in the classpath.
@@ -306,11 +299,11 @@ AxisObserver interface, and the class ha
 service archive file needs to have a services.xml in order to be a valid
 service and it should be available in the META-INF directory of the archive
 file. A very simple services.xml is shown below:</font></p>
-<source><pre>&lt;service name="name of the service" scope="name of the scope" class="full qualifide name the service lifecycle class"   targetNamespace="target namespase for the service"&gt;
+<pre>&lt;service name="name of the service" scope="name of the scope" class="full qualifide name the service lifecycle class"   targetNamespace="target namespase for the service"&gt;
     &lt;Description&gt; The description of the service  &lt;/Description&gt;  
 
     &lt;transports&gt; 
-       &lt;transport&gt;HTTP&lt;/transport&gt;
+        &lt;transport&gt;HTTP&lt;/transport&gt;
     &lt;/transports&gt;
     
     &lt;schema schemaNamespace="schema namespace"/&gt; 
@@ -320,15 +313,14 @@ file. A very simple services.xml is show
                              class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/&gt;
     &lt;/messageReceivers&gt;
      
-     &lt;parameter name="ServiceClass" locked="xsd:false"&gt;org.apache.axis2.sample.echo.EchoImpl&lt;/parameter&gt;
+    &lt;parameter name="ServiceClass" locked="xsd:false"&gt;org.apache.axis2.sample.echo.EchoImpl&lt;/parameter&gt;
     
     &lt;operation name="echoString" mep="operation MEP"&gt; 
         &lt;actionMapping&gt;Mapping to action&lt;/actionMapping&gt;
         &lt;module ref=" a module name "/&gt;
         &lt;messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/&gt;
     &lt;/operation&gt;
-  &lt;/service&gt;</pre>
-</source>
+&lt;/service&gt;</pre>
 <p><strong>name</strong>: The service name will be the name of the archive
 file if the .aar file contains only one service, or else the name of the
 service will be the name given by the name attribute.</p>
@@ -370,12 +362,11 @@ methods in that service will be exposed.
 has to add the "operation" tag and override it. In a non-Java scenario or if
 you do not have a service class, then all the operations the user wants to
 expose by the service has to be indicated in the services.xml. It is
-specified as follows:</p>  <source>
+specified as follows:</p>
 <pre>    &lt;operation name="echoString"&gt;
         &lt;module ref=" a module name "/&gt;
         &lt;messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/&gt;
     &lt;/operation&gt;</pre>
-</source>
 <p>The only compulsory attribute here is "name", which represents the
 operation name that is going to be exposed. Any operation can contain module
 references as well as any number of parameters. The most interesting thing is
@@ -395,7 +386,7 @@ module archive file needs to have a modu
 and it should be available in the META-INF directory of the archive file. <br/>
 </p>
 
-<p>A very simple module.xml is shown below:</p> <source>
+<p>A very simple module.xml is shown below:</p>
 <pre>&lt;module class="org.apache.module.Module1Impl"&gt;
     &lt;InFlow&gt;
         .
@@ -421,7 +412,6 @@ and it should be available in the META-I
         &lt;parameter name="para1" locked="xsd:true"&gt;10&lt;/parameter&gt;
     &lt;/operation&gt;
 &lt;/module&gt;</pre>
-</source>
 <p><strong>class:</strong> (Optional attribute) Indicates the module
 implementation class. A module may or may not contain a module implementation
 class since the module can also be a collection of handlers. If a module
@@ -451,11 +441,10 @@ module.xml. The method of specifying the
 in services.xml.</p>
 
 <p><b>handler:</b> The Handler element consists of compulsory and optional
-attributes. The method of defining a handler will look as follows:</p> <source>
+attributes. The method of defining a handler will look as follows:</p>
 <pre>&lt;handler name="handler1" class="handlerClass "&gt;
             &lt;order phase="userphase1" /&gt;
- &lt;/handler&gt;</pre>
-</source>
+&lt;/handler&gt;</pre>
 <p><b><i>Compulsory Attributes</i></b> <br/>
 <b>name:</b> Name of the handler.<br/>
 <b>class:</b> Handler implementation class.<br/>

Modified: axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/contents.xml.vm
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/contents.xml.vm?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/contents.xml.vm (original)
+++ axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/contents.xml.vm Wed Nov 10 23:31:06 2010
@@ -119,9 +119,8 @@ application, which provides run-time con
 Configuration Guide</a> - Provides extra configuration information
 required for application servers to run Axis2 to its fullest
 potential</li>
-<li><a href=
-"http://ws.apache.org/commons/axiom/OMTutorial.html">AXIOM
-Tutorial</a>-An introduction to Axis2's Object Model</li>
+<li><a href="http://ws.apache.org/axiom/userguide/userguide.html">Axiom User Guide</a> -
+An introduction to Axis2's Object Model</li>
 <li><a href="rest-ws.html">REST Support</a>-Introduction on
 Representational State Transfer</li>
 <li><a href="Axis2-rpc-support.html">Axis2 RPC Support</a> - This

Modified: axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/dii.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/dii.xml?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/dii.xml (original)
+++ axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/dii.xml Wed Nov 10 23:31:06 2010
@@ -155,9 +155,7 @@ directory of the binary distribution.</p
 
 <p>The client code below will invoke the "echo" operation of 
 "MyService" using a pure blocking single-channel invocation.</p>
-<source>
-<pre>  
-   try {
+<pre>   try {
       <span style="color: rgb(36, 193, 19);">            
       OMElement payload = ClientUtil.getEchoOMElement();
       Options options = new Options();
@@ -173,7 +171,6 @@ directory of the binary distribution.</p
       axisFault.printStackTrace();
    } 
 }</pre>
-</source>
 <p>The lines highlighted in green show the set of operations that you need
 to perform in order to invoke the Web service in this manner.</p>
 

Modified: axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/http-transport.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/http-transport.xml?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/http-transport.xml (original)
+++ axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/http-transport.xml Wed Nov 10 23:31:06 2010
@@ -129,7 +129,7 @@ following lines in axis2.xml.</p>
 <pre> &lt;parameter name="CONNECTION_TIMEOUT"&gt;some_integer_value&lt;/parameter&gt;</pre>
 <br/>
 
-For runtime configuration, it can be set as follows within the client stub:<source>
+For runtime configuration, it can be set as follows within the client stub:
 <pre>
 ...
 Options options = new Options();
@@ -141,7 +141,7 @@ options.setTimeOutInMilliSeconds(timeOut
 ...
 </pre>
 
-</source><a name="version_config"></a>
+<a name="version_config"></a>
 
 <h2>HTTP Version Configuration</h2>
 
@@ -203,7 +203,6 @@ HttpTransportProperties.ProxyProperties 
 create an instance of this object, configure proxy values for it,
 and then set it to the MessageContext's property bag via options.setProperty().
 For example:</p>
-<source>
 <pre>
 ...
 Options options = new Options();
@@ -216,7 +215,6 @@ proxyProperties.setProxyPort(...);
 options.setProperty(HttpConstants.PROXY, proxyProperties);
 ...
 </pre>
-</source>
 <p>The above code will override the deployment proxy configuration settings.</p>
 <a name="preemptive_auth"></a>
 
@@ -269,7 +267,6 @@ the state of the server to be authentica
 set to the Options's property bag with the key as HTTPConstants.AUTHENTICATE.
 The following code snippet shows how to configure the transport
 framework to use Basic Authentication:</p>
-<source>
 <pre>
 ...
 Options options = new Options();
@@ -283,7 +280,6 @@ auth.setPassword("password");
 options.setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth);
 ...
 </pre>
-</source>
 <a name="reusing_httpclient_object"></a>
 <h2>Reusing the httpclient object</h2>
 
@@ -294,9 +290,7 @@ handshake may not be of negligible cost.
 object, you can set the relevant property in the Stub:
 </p>
 
-    <source>
         <pre>options.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, "true");</pre>
-    </source>
 
     <a name="setting_cached_httpclient_object"></a>
 <h2>Setting the cached httpclient object</h2>
@@ -308,14 +302,12 @@ set the cached httpclient object when yo
 (before any actual axis request). You can set the relevant property in
 the Stub:
 
-    <source>
     <pre>
 MultiThreadedHttpConnectionManager conmgr = new MultiThreadedHttpConnectionManager();
 conmgr.getParams().setDefaultMaxConnectionsPerHost(10);
 HttpClient client = new HttpClient(conmgr);
 configurationContext.setProperty(HTTPConstants.CACHED_HTTP_CLIENT, client);
 </pre>
-    </source>
 
     <a name="setting_cached_httpstate_object"></a>
 <h2>Setting the cached httpstate object</h2>
@@ -342,12 +334,10 @@ and cookies. This is really complicated 
 
 Sample configuration:
 
-    <source>
     <pre>
 HttpState myHttpState = new HttpState();
 options.setProperty(WSClientConstants.CACHED_HTTP_STATE, myHttpState);
 </pre>
-    </source>
     
 Doing so the HttpState is attached to the client. Respectively this is automatically propagated to all MessageContext objects used by the client. 
 Underneath this just instructs Axis2 that the CACHED_HTTP_STATE set should be passed as a parameter when HttpClient#executeMethod is invoked. 

Modified: axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/mtom-guide.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/mtom-guide.xml?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/mtom-guide.xml (original)
+++ axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/mtom-guide.xml Wed Nov 10 23:31:06 2010
@@ -330,7 +330,7 @@ element at runtime using an MTOM attribu
 Furthermore, you can identify what type of data might be expected in the
 element using the xmime:expectedContentType. Putting it all together, our
 example element becomes:</p>
-<source><pre>      &lt;element name="MyBinaryData" xmime:expectedContentTypes='image/jpeg' &gt;
+<pre>      &lt;element name="MyBinaryData" xmime:expectedContentTypes='image/jpeg' &gt;
         &lt;complexType&gt;
           &lt;simpleContent&gt;
             &lt;extension base="base64Binary" &gt;
@@ -340,18 +340,17 @@ example element becomes:</p>
           &lt;/simpleContent&gt;
         &lt;/complexType&gt;
       &lt;/element&gt;</pre>
-</source>
 <p>You can also use the xmime:base64Binary type to express the above
 mentioned data much clearly.</p>
-<source><pre>      &lt;element name="MyBinaryData" xmime:expectedContentTypes='image/jpeg' type="xmime:base64Binary"/&gt;</pre>
-</source><a name="251"></a>
+<pre>      &lt;element name="MyBinaryData" xmime:expectedContentTypes='image/jpeg' type="xmime:base64Binary"/&gt;</pre>
+<a name="251"></a>
 
 <h3>MTOM Databinding Using ADB</h3>
 
 <p>Let's define a full, validated doc/lit style WSDL that uses the xmime
 schema, has a service that receives a file, and saves it in the server using
 the given path.</p>
-<source><pre>&lt;wsdl:definitions xmlns:tns="http://ws.apache.org/axis2/mtomsample/"
+<pre>&lt;wsdl:definitions xmlns:tns="http://ws.apache.org/axis2/mtomsample/"
         xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
         xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
         xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
@@ -437,7 +436,6 @@ the given path.</p>
                 &lt;/wsdl:port&gt;
         &lt;/wsdl:service&gt;
 &lt;/wsdl:definitions&gt;</pre>
-</source>
 <p>The important point here is we import http://www.w3.org/2005/05/xmlmime
 and define the element 'binaryData' that utilizes MTOM.</p>
 
@@ -447,7 +445,7 @@ information. Here, we define an Ant task
 Binding) as the databinding implementation. The name we list for the WSDL
 above is MTOMSample.wsdl, and we define our package name for our generated
 source files to 'sample.mtom.service' . Our Ant task for this example is:</p>
-<source><pre>        
+<pre>        
 &lt;target name="generate.service"&gt;
                  &lt;java classname="org.apache.axis2.wsdl.WSDL2Java"&gt;
                         &lt;arg value="-uri" /&gt;
@@ -462,11 +460,10 @@ source files to 'sample.mtom.service' . 
                         &lt;classpath refid="class.path" /&gt;
                 &lt;/java&gt;
           &lt;/target&gt;</pre>
-</source>
 <p>Now we are ready to code. Let's edit
 output/src/sample/mtom/service/MTOMSampleSkeleton.java and fill in the
 business logic. Here is an example:</p>
-<source><pre>        public org.apache.ws.axis2.mtomsample.AttachmentResponse attachment(
+<pre>        public org.apache.ws.axis2.mtomsample.AttachmentResponse attachment(
                         org.apache.ws.axis2.mtomsample.AttachmentRequest param0) throws Exception
         {
                 AttachmentType attachmentRequest = param0.getAttachmentRequest();
@@ -483,11 +480,10 @@ business logic. Here is an example:</p>
                 response.setAttachmentResponse("File saved succesfully.");
                 return response;
         }</pre>
-</source>
 <p>The code above receives a file and writes it to the disk using the given
 file name. It returns a message once it is successful. Now let's define the
 client:</p>
-<source><pre>        public static void transferFile(File file, String destination)
+<pre>        public static void transferFile(File file, String destination)
                         throws RemoteException {
                 MTOMSampleStub serviceStub = new MTOMSampleStub();
 
@@ -517,7 +513,6 @@ client:</p>
                 AttachmentResponse response = serviceStub.attachment(attachmentRequest);
                 System.out.println(response.getAttachmentResponse());
         }</pre>
-</source>
 <p>The last step is to create an AAR with our Skeleton and the services.xml
 and then deploy the service. You can find the completed sample in the Axis2
 standard binary distribution under the samples/mtom directory</p>
@@ -544,7 +539,7 @@ support Content Location based referenci
   <li><strong>Sample service which accesses a received SwA type
     attachment</strong></li>
 </ul>
-<source><pre>public class SwA {
+<pre>public class SwA {
     public SwA() {
     }
     
@@ -565,7 +560,7 @@ support Content Location based referenci
         ...........
     }
 }</pre>
-</source><a name="32"></a>
+<a name="32"></a>
 
 <h3>Sending SwA Type Attachments</h3>
 
@@ -575,13 +570,11 @@ enable MTOM and SwA together. In such a 
 over SwA.</p>
 
 <p>This can be set using the axis2.xml as follows.</p>
-<source><pre>  
+<pre>  
         &lt;parameter name="enableSwA"&gt;true&lt;/parameter&gt;</pre>
-</source>
 <p>"enableSwA" can also be set using the client side Options as follows</p>
-<source><pre>  
+<pre>  
         options.setProperty(Constants.Configuration.ENABLE_SwA, Constants.VALUE_TRUE);</pre>
-</source>
 <p>Users are expected to use the attachment API provided in the
 MessageContext to specify the binary attachments needed to be attached to the
 outgoing message as SwA type attachments. Client side SwA capability can be
@@ -591,7 +584,7 @@ access the MessageContext.</p>
   <li><strong>Sample client which sends a message with SwA type
     attachments</strong></li>
 </ul>
-<source><pre>   public void uploadFileUsingSwA(String fileName) throws Exception {
+<pre>   public void uploadFileUsingSwA(String fileName) throws Exception {
 
         Options options = new Options();
         options.setTo(targetEPR);
@@ -613,7 +606,7 @@ access the MessageContext.</p>
         mepClient.addMessageContext(mc);
         mepClient.execute(true);
     }</pre>
-</source><a name="33"></a>
+<a name="33"></a>
 
 <h3>MTOM Backward Compatibility with SwA</h3>
 
@@ -629,7 +622,7 @@ SwA message.</p>
 <ul>
   <li><strong>A sample SwA message from Axis 1.x</strong></li>
 </ul>
-<source><pre>Content-Type: multipart/related; type="text/xml"; 
+<pre>Content-Type: multipart/related; type="text/xml"; 
           start="&lt;9D645C8EBB837CE54ABD027A3659535D&gt;";
                 boundary="----=_Part_0_1977511.1123163571138"
 
@@ -652,10 +645,10 @@ Content-Id: &lt;3936AE19FBED55AE4620B81C
 
 <em>Binary Data.....</em>
 ------=_Part_0_1977511.1123163571138--</pre>
-</source><ul>
+<ul>
   <li><strong>Corresponding MTOM message from Axis2</strong></li>
 </ul>
-<source><pre>Content-Type: multipart/related; boundary=MIMEBoundary4A7AE55984E7438034;
+<pre>Content-Type: multipart/related; boundary=MIMEBoundary4A7AE55984E7438034;
                          type="application/xop+xml"; start="&lt;0.09BC7F4BE2E4D3EF1B@apache.org&gt;";
                          start-info="text/xml; charset=utf-8"
 
@@ -680,7 +673,7 @@ content-id: &lt;1.A91D6D2E3D7AC4D580@apa
 
 <em>Binary Data.....</em>
 --MIMEBoundary4A7AE55984E7438034--</pre>
-</source><a name="4"></a>
+<a name="4"></a>
 
 <h2>Advanced Topics</h2>
 <a name="41"></a>
@@ -704,7 +697,7 @@ directory</strong> from time to time.</p
 
 <p>The following parameters need to be set in Axis2.xml in order to enable
 file caching.</p>
-<source><pre>&lt;axisconfig name="AxisJava2.0"&gt;
+<pre>&lt;axisconfig name="AxisJava2.0"&gt;
 
     &lt;!-- ================================================= --&gt;
     &lt;!-- Parameters --&gt;
@@ -716,11 +709,10 @@ file caching.</p>
     .........
     .........
 &lt;/axisconfig&gt;</pre>
-</source>
 <p>Enabling file caching for client side receiving can be done for the by
 setting the Options as follows.</p>
-<source><pre>options.setProperty(Constants.Configuration.CACHE_ATTACHMENTS,Constants.VALUE_TRUE);
+<pre>options.setProperty(Constants.Configuration.CACHE_ATTACHMENTS,Constants.VALUE_TRUE);
 options.setProperty(Constants.Configuration.ATTACHMENT_TEMP_DIR,<em>TempDir</em>);
 options.setProperty(Constants.Configuration.FILE_SIZE_THRESHOLD, <em>"4000"</em>);</pre>
-</source></body>
+</body>
 </html>

Modified: axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/pojoguide.xml.vm
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/pojoguide.xml.vm?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/pojoguide.xml.vm (original)
+++ axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/pojoguide.xml.vm Wed Nov 10 23:31:06 2010
@@ -631,10 +631,7 @@ beans support and initialization abiliti
 other goodies provided by the Spring framework.</p>
 <a name="furtherstudy" id="furtherstudy"></a>
 <h2>For Further Study</h2>
-<p>Apache Axis2-<a href=
-"http://ws.apache.org/axis2/">http://ws.apache.org/axis2/</a></p>
-<p>Axis2 Architecture-<a href=
-"http://ws.apache.org/axis2/1_0/Axis2ArchitectureGuide.html">http://ws.apache.org/axis2/1_0/Axis2ArchitectureGuide.html</a></p>
+<p><a href="Axis2ArchitectureGuide.html">Axis2 Architecture</a></p>
 <p>Introduction to Apache Axis2-<a href=
 "http://www.redhat.com/magazine/021jul06/features/apache_axis2/">http://www.redhat.com/magazine/021jul06/features/apache_axis2/</a></p>
 <p><a href="http://wso2.org/library/259">Working With Apache Axis2</a></p>

Modified: axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/quickstartguide.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/quickstartguide.xml?rev=1033776&r1=1033775&r2=1033776&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/quickstartguide.xml (original)
+++ axis/axis2/java/core/branches/1_5/src/site/xdoc/docs/quickstartguide.xml Wed Nov 10 23:31:06 2010
@@ -475,10 +475,10 @@ Framework (ADB), execute the following s
 following in the Axis2_HOME/samples/quickstartadb directory:</p>
 <pre>
 (Windows)
-%AXIS2_HOME%\bin\WSDL2Java -uri resources\META-INF\StockQuoteService.wsdl -p samples.quickstart.service.adb -d adb -s -ss -sd -ssi -o build\service
+%AXIS2_HOME%\bin\wsdl2java -uri resources\META-INF\StockQuoteService.wsdl -p samples.quickstart.service.adb -d adb -s -ss -sd -ssi -o build\service
 
 (Linux)
-$AXIS2_HOME/bin/WSDL2Java -uri resources/META-INF/StockQuoteService.wsdl -p samples.quickstart.service.adb -d adb -s -ss -sd -ssi -o build/service
+$AXIS2_HOME/bin/wsdl2java -uri resources/META-INF/StockQuoteService.wsdl -p samples.quickstart.service.adb -d adb -s -ss -sd -ssi -o build/service
 
 </pre>
 <p>Else, simply type ant generate.service in the
@@ -560,7 +560,7 @@ steps.</p>
 following in the Axis2_HOME/samples/quickstartxmlbeans
 directory.</p>
 <pre>
-%AXIS2_HOME%\bin\WSDL2Java -uri resources\META-INF\StockQuoteService.wsdl -p samples.quickstart.service.xmlbeans -d xmlbeans -s -ss -sd -ssi -o build\service
+%AXIS2_HOME%\bin\wsdl2java -uri resources\META-INF\StockQuoteService.wsdl -p samples.quickstart.service.xmlbeans -d xmlbeans -s -ss -sd -ssi -o build\service
 </pre>
 <p>Else simply type ant generate.service in the
 Axis2_HOME/samples/quickstartxmlbeans directory.</p>
@@ -839,7 +839,7 @@ following steps.</p>
 <p>Generate the client databings by typing the following in the
 Axis2_HOME/samples/quickstartadb directory:</p>
 <pre>
-%AXIS2_HOME%\bin\WSDL2Java -uri resources\META-INF\StockQuoteService.wsdl -p samples.quickstart.clients -d adb -s -o build\client
+%AXIS2_HOME%\bin\wsdl2java -uri resources\META-INF\StockQuoteService.wsdl -p samples.quickstart.clients -d adb -s -o build\client
 </pre>
 <p>Else, simply type ant generate.client in the
 Axis2_HOME/samples/quickstartadb directory.</p>
@@ -924,7 +924,7 @@ following steps.</p>
 <p>Generate the databings by typing the following in the
 xmlbeansClient directory.</p>
 <pre>
-%AXIS2_HOME%\bin\WSDL2Java -uri resources\META-INF\StockQuoteService.wsdl -p samples.quickstart.service.xmlbeans -d xmlbeans -s -o build\client
+%AXIS2_HOME%\bin\wsdl2java -uri resources\META-INF\StockQuoteService.wsdl -p samples.quickstart.service.xmlbeans -d xmlbeans -s -o build\client
 </pre>
 <p>Else, simply type ant generate.client in the
 Axis2_HOME/samples/quickstartxmlbeans directory.</p>