Author: dkulp
Date: Thu Jan 22 11:54:32 2009
New Revision: 736760
URL: http://svn.apache.org/viewvc?rev=736760&view=rev
Log:
Merged revisions 736448 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r736448 | dkulp | 2009-01-21 17:22:01 -0500 (Wed, 21 Jan 2009) | 3 lines
Rename the archetype to something more appropriate, put in archetypes groupid
........
Added:
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/
(props changed)
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
- copied unchanged from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype.xml
- copied unchanged from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/META-INF/maven/archetype.xml
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
- copied unchanged from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
- copied unchanged from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
- copied unchanged from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/
- copied from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
- copied unchanged from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
- copied unchanged from r736448,
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Removed:
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/pom.xml
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 22 11:54:32 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736352,736358-736362,736408,736423,736621,736726
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736352,736358-736362,736408,736423,736448,736621,736726
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange:
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 22 11:54:32 2009
@@ -0,0 +1,9 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
Propchange:
cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/
------------------------------------------------------------------------------
svn:mergeinfo =
/cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst:736448
Modified: cxf/branches/2.1.x-fixes/maven-plugins/archetypes/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/maven-plugins/archetypes/pom.xml?rev=736760&r1=736759&r2=736760&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/maven-plugins/archetypes/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/maven-plugins/archetypes/pom.xml Thu Jan 22
11:54:32 2009
@@ -35,6 +35,6 @@
<modules>
- <module>cxf-http-basic</module>
+ <module>cxf-jaxws-javafirst</module>
</modules>
</project>
\ No newline at end of file
Modified:
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java?rev=736760&r1=736759&r2=736760&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
Thu Jan 22 11:54:32 2009
@@ -73,7 +73,7 @@
throw new SoapFault(new Message("MUST_UNDERSTAND", BUNDLE,
notUnderstandHeaders),
soapVersion.getMustUnderstand());
}
- if (!ultimateReceiverHeaders.isEmpty()) {
+ if (!ultimateReceiverHeaders.isEmpty() && !isRequestor(soapMessage)) {
soapMessage.getInterceptorChain()
.add(new
UltimateReceiverMustUnderstandInterceptor(mustUnderstandQNames));
}
