svn commit: r985458 - in /axis/axis2/java/core/trunk/modules: tool/axis2-aar-maven-plugin/pom.xml tool/axis2-mar-maven-plugin/pom.xml transport/http/pom.xml transport/local/pom.xml webapp/pom.xml
Author: veithen
Date: Sat Aug 14 11:00:06 2010
New Revision: 985458
URL: http://svn.apache.org/viewvc?rev=985458&view=rev
Log:
Fixed the POMs so that all relevant artifacts contain the right set of legal
files.
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/pom.xml
axis/axis2/java/core/trunk/modules/transport/local/pom.xml
axis/axis2/java/core/trunk/modules/webapp/pom.xml
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=985458&r1=985457&r2=985458&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml Sat
Aug 14 11:00:06 2010
@@ -71,23 +71,23 @@
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin
-
-
-src/main/resources
-
-**/*
-
-false
-
-
-../../..
-
-NOTICE.txt
-LICENSE.txt
-
-false
-
-
+
+
+maven-remote-resources-plugin
+
+
+
+process
+
+
+
+
org.apache.axis2:axis2-resource-bundle:${project.version}
+
+
+
+
+
+
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml?rev=985458&r1=985457&r2=985458&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml
(original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml Sat
Aug 14 11:00:06 2010
@@ -72,23 +72,23 @@
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin
-
-
-../../..
-
-NOTICE.txt
-LICENSE.txt
-
-false
-
-
-src/main/resources
-
-**/*
-
-false
-
-
+
+
+maven-remote-resources-plugin
+
+
+
+process
+
+
+
+
org.apache.axis2:axis2-resource-bundle:${project.version}
+
+
+
+
+
+
Modified: axis/axis2/java/core/trunk/modules/transport/http/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/pom.xml?rev=985458&r1=985457&r2=985458&view=diff
==
--- axis/axis2/java/core/trunk/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/pom.xml Sat Aug 14
11:00:06 2010
@@ -41,6 +41,21 @@
test
+maven-remote-resources-plugin
+
+
+
+process
+
+
+
+
org.apache.axis2:axis2-resource-bundle:${project.version}
+
+
+
+
+
+
org.apache.felix
maven-bundle-plugin
true
Modified: axis/axis2/java/core/trunk/modules/transport/local/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/pom.xml?rev=985458&r1=985457&r2=985458&view=diff
==
--- axis/axis2/java/core/trunk/modules/transport/local/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/local/pom.xml Sat Aug 14
11:00:06 2010
@@ -41,6 +41,21 @@
svn commit: r985464 - /axis/axis2/java/core/trunk/modules/webapp/pom.xml
Author: veithen Date: Sat Aug 14 11:24:48 2010 New Revision: 985464 URL: http://svn.apache.org/viewvc?rev=985464&view=rev Log: Fixed the POM of the webapp so that compiled JSPs are not included in the WAR (the purpose of using jspc-maven-plugin is only to validate the JSPs and to detect syntax errors during the build). Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=985464&r1=985463&r2=985464&view=diff == --- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sat Aug 14 11:24:48 2010 @@ -1379,6 +1379,7 @@ + org.codehaus.mojo.jspc jspc-maven-plugin 2.0-alpha-3 @@ -1390,8 +1391,6 @@ - false @@ -1403,6 +1402,28 @@ +maven-antrun-plugin + + + +process-classes + +run + + + + + + + + + + maven-war-plugin axis2
svn commit: r985468 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/
Author: veithen Date: Sat Aug 14 11:33:02 2010 New Revision: 985468 URL: http://svn.apache.org/viewvc?rev=985468&view=rev Log: Merged r805981 to the 1.5 branch. Modified: axis/axis2/java/core/branches/java/1_5/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 11:33:02 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372 -/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 +/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805981,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 11:33:02 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372 -/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 +/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805981,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 11:33:02 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372 -/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/u
svn commit: r985469 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/
Author: veithen Date: Sat Aug 14 11:41:18 2010 New Revision: 985469 URL: http://svn.apache.org/viewvc?rev=985469&view=rev Log: Merged r783479,985464 to the 1.5 branch. This in particular fixes AXIS2-4371 (something that we originally considered for inclusion into 1.5.1). Modified: axis/axis2/java/core/branches/java/1_5/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/TopFrame.jsp axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/viewphases.jsp Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 11:41:18 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372 -/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805981,805999,807160,807487,816740,834058,834175,904780,905980 +/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985464 +/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 11:41:18 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372 -/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805981,805999,807160,807487,816740,834058,834175,904780,905980 +/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,9827
svn commit: r985470 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/
Author: veithen Date: Sat Aug 14 11:46:30 2010 New Revision: 985470 URL: http://svn.apache.org/viewvc?rev=985470&view=rev Log: Merged r985458 to the 1.5 branch. Modified: axis/axis2/java/core/branches/java/1_5/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml (contents, props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/local/pom.xml axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 11:46:30 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985464 +/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464 /webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 11:46:30 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985464 +/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464 /webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 11:46:30 2010 @@ -1,2 +1
svn commit: r985478 - in /axis/axis2/java/core/trunk/modules: jaxws-integration/test/org/apache/axis2/jaxws/sample/ jaxws-integration/test/org/apache/axis2/jaxws/sample/dlwminArrays/ jaxws/src/org/apa
Author: scheu
Date: Sat Aug 14 12:33:18 2010
New Revision: 985478
URL: http://svn.apache.org/viewvc?rev=985478&view=rev
Log:
AXIS2-4796
Contributor:Rich Scheuerle
Summary:
Allows null arguments to web methods that have java.util.List
parameters/returns
Added a verification test.
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/DLWMinArrayTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/dlwminArrays/GenericService.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMinimalMethodMarshaller.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/OccurrenceArray.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/DLWMinArrayTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/DLWMinArrayTests.java?rev=985478&r1=985477&r2=985478&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/DLWMinArrayTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/DLWMinArrayTests.java
Sat Aug 14 12:33:18 2010
@@ -251,6 +251,45 @@ public class DLWMinArrayTests extends Ab
/**
* Test method that echos a List of beans (List)
+ * The list contains no items.
+ */
+public void testEchoComplexListNull() throws Exception {
+
+IGenericService proxy = getProxy("echoComplexList");
+
+// There really is no discernible difference between
+// an empty array and null over the wire. Sometimes users
+// will pass in a null on the client or server.
+
+List response = proxy.echoComplexList(null);
+assertTrue(response != null);
+assertTrue(response.size() == 0);
+
+// Try the call again
+response = proxy.echoComplexList(null);
+assertTrue(response != null);
+assertTrue(response.size() == 0);
+
+// Now try force the server to return a null argument
+List in = new ArrayList();
+WSUser wsUser = new WSUser();
+wsUser.setUserID("FORCENULL");
+in.add(wsUser);
+
+response = proxy.echoComplexList(in);
+assertTrue(response != null);
+assertTrue(response.size() == 0);
+
+// Try the call again
+response = proxy.echoComplexList(in);
+assertTrue(response != null);
+assertTrue(response.size() == 0);
+
+
+}
+
+/**
+ * Test method that echos a List of beans (List)
* and echos a List as an inout parameter.
* 2 WSUsers are echo'd
* 2 Strings are echo'd
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/dlwminArrays/GenericService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/dlwminArrays/GenericService.java?rev=985478&r1=985477&r2=985478&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/dlwminArrays/GenericService.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/dlwminArrays/GenericService.java
Sat Aug 14 12:33:18 2010
@@ -64,6 +64,9 @@ public class GenericService implements I
}
public List echoComplexList(List in ) {
+if (in.size() > 0 && in.get(0).getUserID().equals("FORCENULL")) {
+return null;
+}
return in;
}
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMinimalMethodMarshaller.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMinimalMethodMarshaller.java?rev=985478&r1=985477&r2=985478&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMinimalMethodMarshaller.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMinimalMethodMarshaller.java
Sat Aug 14 12:33:18 2010
@@ -342,7 +342,7 @@ public class DocLitWrappedMinimalMethodM
if (returnType != void.class) {
Element returnElement = null;
QName returnQName = new QName(returnNS, returnLocalPart);
-if (representAsOccurrence(returnObject)) {
+if (representAsOccurrence(
svn commit: r985491 - /axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
Author: scheu
Date: Sat Aug 14 13:49:22 2010
New Revision: 985491
URL: http://svn.apache.org/viewvc?rev=985491&view=rev
Log:
Debug trace changes only.
Modified:
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
Modified:
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=985491&r1=985490&r2=985491&view=diff
==
---
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
(original)
+++
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
Sat Aug 14 13:49:22 2010
@@ -264,6 +264,9 @@ public class AddressingInHandler extends
// Now that all the valid wsa headers have been read, throw an
exception if there was an invalid cardinality
// This means that if for example there are multiple MessageIDs and a
FaultTo, the FaultTo will be respected.
if (!duplicateHeaderNames.isEmpty()) {
+if (log.isDebugEnabled()) {
+log.debug("Duplicate header names found:" +
duplicateHeaderNames.get(0));
+}
// Simply choose the first problem header we came across as we can
only fault for one of them.
AddressingFaultsHelper.triggerInvalidCardinalityFault(messageContext,
(String)
duplicateHeaderNames
@@ -512,12 +515,16 @@ public class AddressingInHandler extends
String wsaAction = soapHeaderBlock.getText();
if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
-log.trace("extractActionInformation: soapAction='" + soapAction +
"' wsa:Action='" +
- wsaAction + "'");
+log.trace("extractActionInformation: HTTP soapAction or action ='"
+ soapAction +
+"' wsa:Action='" + wsaAction + "'");
}
// Need to validate that the content of the wsa:Action header is not
null or whitespace
if ((wsaAction == null) || "".equals(wsaAction.trim())) {
+if (log.isDebugEnabled()) {
+log.debug("The wsa:Action header is present but its contents
are empty. This violates " +
+"rules in the WS-A specification. The SOAP node that
sent this message must be changed.");
+}
AddressingFaultsHelper.triggerActionNotSupportedFault(messageContext,
wsaAction);
}
@@ -529,6 +536,11 @@ public class AddressingInHandler extends
// check that soapAction==wsa:Action
if (soapAction != null && !"".equals(soapAction) &&
messageContext.isServerSide()) {
if (!soapAction.equals(wsaAction)) {
+if (log.isDebugEnabled()) {
+log.debug("The wsa:Action header is (" + wsaAction + ")
which conflicts with the HTTP soapAction or action " +
+"(" + soapAction + "). This is a violation of the
WS-A specification. The SOAP node that sent this message " +
+" must be changed.");
+}
AddressingFaultsHelper.triggerActionMismatchFault(messageContext, soapAction,
wsaAction);
}
} else {
