svn commit: r651292 - in /incubator/cxf/trunk/distribution/src/main/release: README release_notes.txt

[dkulp]

Author: dkulp
Date: Thu Apr 24 08:39:01 2008
New Revision: 651292

URL: http://svn.apache.org/viewvc?rev=651292&view=rev
Log:
Fix "beta" stuff and web site locations

Modified:
incubator/cxf/trunk/distribution/src/main/release/README
incubator/cxf/trunk/distribution/src/main/release/release_notes.txt

Modified: incubator/cxf/trunk/distribution/src/main/release/README
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/README?rev=651292&r1=651291&r2=651292&view=diff
==
--- incubator/cxf/trunk/distribution/src/main/release/README (original)
+++ incubator/cxf/trunk/distribution/src/main/release/README Thu Apr 24 
08:39:01 2008
@@ -66,10 +66,10 @@
 features.
 
 Alternatively, you can also find out how to get started here:
-http://incubator.apache.org/cxf/
+http://cxf.apache.org/
 
 If you need more help try talking to us on our mailing lists:
-http://incubator.apache.org/cxf/mailing-lists.html
+http://cxf.apache.org/mailing-lists.html
  
 If you find any issues with CXF, please submit reports with JIRA here:
 https://issues.apache.org/jira/browse/CXF
@@ -77,9 +77,9 @@
 We welcome contributions, and encourage you to get involved in the CXF
 community. If you'd like to learn more about how you can contribute, please
 see:
-http://incubator.apache.org/cxf/getting-involved.html
+http://cxf.apache.org/getting-involved.html
 
 Thank you for using CXF!
 
 The Apache CXF Team
-http://incubator.apache.org/cxf/
+http://cxf.apache.org/

Modified: incubator/cxf/trunk/distribution/src/main/release/release_notes.txt
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/release_notes.txt?rev=651292&r1=651291&r2=651292&view=diff
==
--- incubator/cxf/trunk/distribution/src/main/release/release_notes.txt 
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/release_notes.txt Thu Apr 
24 08:39:01 2008
@@ -1,8 +1,8 @@
-Apache CXF 2.1 Beta 1 Release Notes
+Apache CXF 2.1 Release Notes
 
 1. Overview
 
-Apache CXF 2.1 (Beta 1) delivers the second major version of 
+Apache CXF 2.1 delivers the second major version of 
 the Celtix project (http://celtix.objectweb.org) and the XFire project
 (http://xfire.codehaus.org) merge.  This release is a major update from 
 the 2.0.x series.   The major new addition is JAX-WS 2.1 support.  However, 
there

svn commit: r651299 - /incubator/cxf/tags/cxf-2.1/

[dkulp]

Author: dkulp
Date: Thu Apr 24 09:01:41 2008
New Revision: 651299

URL: http://svn.apache.org/viewvc?rev=651299&view=rev
Log:
Remove tag as release needs to be withdrawn and rebuilt

Removed:
incubator/cxf/tags/cxf-2.1/

svn commit: r651304 - /incubator/cxf/trunk/STATUS

[dkulp]

Author: dkulp
Date: Thu Apr 24 09:23:31 2008
New Revision: 651304

URL: http://svn.apache.org/viewvc?rev=651304&view=rev
Log:
Remove incubator checklist from STATUS

Modified:
incubator/cxf/trunk/STATUS

Modified: incubator/cxf/trunk/STATUS
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/STATUS?rev=651304&r1=651303&r2=651304&view=diff
==
--- incubator/cxf/trunk/STATUS (original)
+++ incubator/cxf/trunk/STATUS Thu Apr 24 09:23:31 2008
@@ -1,52 +1,36 @@
+
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+
 ##
 ## $Rev$ $Date$
 ##
 
-Exit Criteria
-(put an X next to item when it is complete):
-
-Copyrights & Licensing
-
-X  -- Do all the software in the codebase has its copyright assigned to The
- Apache Software Foundation?
-
-X  -- Do All the software in the codebase, are licensed (or multi-licensed) 
under the
- Apache licence?
-
-X  -- Do all the software in the codebase,are compliant with the
- Specifications set by Java Community Process?(Wherever applicable)
- * This criteria has been superceded by the Exit Milestone below
-
-Distribution rights
-
-X  -- For all code included with the distribution that is not under the
- Apache license, do we have the right to combine with Apache-licensed
- code and redistribute?
-
-X  -- Is all source code distributed by the project covered by one or more
- of the following approved licenses:  Apache, BSD, Artistic, MIT/X,
- MIT/W3C, MPL 1.1, or something with essentially the same terms?
-
-Infrastructure
-
-X -- SVN modules created and committers added to avail file?
- Yes:   https://svn.apache.org/repos/asf/incubator/cxf
-
-X  -- Are the developer,commit and user mailing lists set up and archived?
-
-X  -- Bug tracking system enabled?
- Yes:   https://issues.apache.org/jira/browse/CXF
-
-X  -- wiki based documentation site enabled?
- Yes:   http://cwiki.apache.org/confluence/display/CXF/Index
 
-X  -- Has the project migrated to our infrastructure?
+
+ Apache CXF Status
+
 
-Committers:
+Apache CXF graduated from the Incubator on 04/16/2008
+Infrastructure is still working on moving resources.  SVN is the primary thing 
+left to move.
 
-X  -- Have all of the active long-term volunteers been identified
- and acknowledged as committers on the project?
 
+Project committers:
apaibir
bharathganesh
blin
@@ -71,38 +55,4 @@
unrealjiang
 
 
-X  -- Have all the commiters signed the CLA?
-
-X  -- Do they have accounts on svn.apache.org?
-
-X  -- Are there three or more independent committers?
- Yes
-
-Collaborative Development:
-
-X  -- Are project decisions being made in public by the committers?
-
-X  -- Are the decision-making guidelines published and agreed to by
- all of the committers?
-
-X  -- Does the documentation site has enough information on the architecure, 
design decisions and
- modules?
-
-  -- Has the community, the graduation/new PMC of the project to which the 
codebase and community
- will move at the end of incubation (if any), and the Incubator PMC, 
decided the
- expected time frame of stay in incubator?
-
-X  -- Has the community adopted the Apache voting rules and is otherwise 
following the Apache
- guidelines?
-
-Exit Milestone:
-
-organisational acceptance:
-
-  -- Has the board accepted moving to a existing/new PMC?
-
-
-Incubator sign-off:
 
-  -- Has the Incubator decided that the project has accomplished all
- of the above tasks?

svn commit: r651305 - /incubator/cxf/trunk/distribution/src/main/assembly/src.xml

[dkulp]

Author: dkulp
Date: Thu Apr 24 09:25:54 2008
New Revision: 651305

URL: http://svn.apache.org/viewvc?rev=651305&view=rev
Log:
Remove KEYS file from distributions (no-one should ever trust that file in the 
distribution)

Modified:
incubator/cxf/trunk/distribution/src/main/assembly/src.xml

Modified: incubator/cxf/trunk/distribution/src/main/assembly/src.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/src.xml?rev=651305&r1=651304&r2=651305&view=diff
==
--- incubator/cxf/trunk/distribution/src/main/assembly/src.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/src.xml Thu Apr 24 
09:25:54 2008
@@ -78,6 +78,7 @@
 **/var/journal
 **/build.out*
 STATUS
+KEYS
 
 
 

svn commit: r651327 - in /incubator/cxf/trunk: distribution/src/main/release/samples/js_browser_client_java_first/ distribution/src/main/release/samples/js_browser_client_simple/ distribution/src/main

[dkulp]

Author: dkulp
Date: Thu Apr 24 10:52:29 2008
New Revision: 651327

URL: http://svn.apache.org/viewvc?rev=651327&view=rev
Log:
Move the last remaining schema into "schemas" so we can make it "live"

Added:
incubator/cxf/trunk/rt/bindings/object/src/main/resources/schemas/
incubator/cxf/trunk/rt/bindings/object/src/main/resources/schemas/bindings/

incubator/cxf/trunk/rt/bindings/object/src/main/resources/schemas/bindings/object.xsd
   (with props)
Removed:
incubator/cxf/trunk/rt/bindings/object/src/main/resources/org/
Modified:

incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml

incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml
incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first/cxf.xml

incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first_anttasks/cxf.xml

incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/spring.schemas

Modified: 
incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml?rev=651327&r1=651326&r2=651327&view=diff
==
--- 
incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml
 (original)
+++ 
incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml
 Thu Apr 24 10:52:29 2008
@@ -21,11 +21,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:jaxws="http://cxf.apache.org/jaxws";
xmlns:cxf="http://cxf.apache.org/core";
-   xmlns:soap="http://cxf.apache.org/bindings/soap";
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration";
xsi:schemaLocation="
 http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/bindings/soap 
http://cxf.apache.org/schema/bindings/soap.xsd
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
 http://cxf.apache.org/transports/http-jetty/configuration 
http://cxf.apache.org/schemas/configuration/http-jetty.xsd

Modified: 
incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml?rev=651327&r1=651326&r2=651327&view=diff
==
--- 
incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml
 (original)
+++ 
incubator/cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml
 Thu Apr 24 10:52:29 2008
@@ -21,12 +21,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
   xmlns:jaxws="http://cxf.apache.org/jaxws";
   xmlns:cxf="http://cxf.apache.org/core";
-  xmlns:soap="http://cxf.apache.org/bindings/soap";
   xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration";
 
   xsi:schemaLocation="
 http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/bindings/soap 
http://cxf.apache.org/schema/bindings/soap.xsd
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
 http://cxf.apache.org/transports/http-jetty/configuration 
http://cxf.apache.org/schemas/configuration/http-jetty.xsd

Modified: 
incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first/cxf.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first/cxf.xml?rev=651327&r1=651326&r2=651327&view=diff
==
--- 
incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first/cxf.xml 
(original)
+++ 
incubator/cxf/trunk/distribution/src/main/release/samples/wsdl_first/cxf.xml 
Thu Apr 24 10:52:29 2008
@@ -21,10 +21,8 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
   xmlns:jaxws="http://cxf.apache.org/jaxws";
   xmlns:cxf="http://cxf.apache.org/core";
-  xmlns:soap="http://cxf.apache.org/bindings/soap";
   xsi:schemaLocation="
 http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/bindings/soap 
http://cxf.apache.org/schema/bindings/soap.xsd
 http://cxf.apache.org/

svn commit: r651331 - /incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt

[dkulp]

Author: dkulp
Date: Thu Apr 24 11:11:18 2008
New Revision: 651331

URL: http://svn.apache.org/viewvc?rev=651331&view=rev
Log:
Prepare release notes

Modified:

incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt

Modified: 
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt?rev=651331&r1=651330&r2=651331&view=diff
==
--- 
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt
 Thu Apr 24 11:11:18 2008
@@ -1,11 +1,9 @@
-Apache CXF 2.0.5 Release Notes
+Apache CXF 2.0.6 Release Notes
 
 1. Overview
 
-Apache CXF 2.0.5 delivers the third milestone of 
-the Celtix project (http://celtix.objectweb.org) and the XFire project
-(http://xfire.codehaus.org) merge.  This release is mostly a patch release
-from 2.0.4 fixing 34 JIRA issues as well as enhancing startup performance.
+Apache CXF 2.0.6 delivers the latest set of patches for the 2.0.x series
+fixing another 21 reported JIRA issues.
 
 
 2. Installation Prerequisites 
@@ -80,50 +78,28 @@
 
 6. Specific issues, features, and improvements fixed in the 
 
-Release Notes - CXF - Version 2.0.5
-
+Release Notes - CXF - Version 2.0.6
 
 ** Bug
-* [CXF-907] - WSDLToJava fails to generate parameter for request header
-* [CXF-935] - Provider not working when its WSDL is supplied from spring 
configuration.
-* [CXF-1020] - WSDL2Java tool error: failed to generate codes with 
twoHeadersSameNameDifferentNamespace
-* [CXF-1247] - WSDLValidator does not use CatalogResolver to reslove wsdl 
-* [CXF-1269] - Using contentType = "application/octet-stream" on returned 
Datahandler/DataSource causes an InputStream to be left open
-* [CXF-1386] - java2wsdl: NullPointerException on @WebService interface 
throwing custom Exception
-* [CXF-1401] - More shutdown problems with jetty
-* [CXF-1408] - Data not returned if /tmp/cxf-tmp- deleted
-* [CXF-1412] - In  ClientFaultConverter', setStackTrace() throws 
NullPointerException if 'ss' String is null
-* [CXF-1417] - SOAPFaultException built programmatically and thrown in a 
JAX-WS handler are not correctly populated
-* [CXF-1418] - Problem having multiple interceptors of the same type on 
the interceptor chain
-* [CXF-1419] - JMS Server Response headers not populated properly
-* [CXF-1420] - LogUtils.log fails when trying to log an error with a 
question mark.
-* [CXF-1429] - Memory Leak at PolicyEngineImpl
-* [CXF-1430] - ThreadLocal Memory leak in HandlerChainInvoker
-* [CXF-1432] - Throwables should be serializable
-* [CXF-1433] - WS-Security vulnerability
-* [CXF-1435] - BusApplicationContext should pass empty String array to 
super constructor instead of null
-* [CXF-1436] - Error in WS-Security 1.1 Signature Confirmation handling
-* [CXF-1437] - schemas without *.xsd extensions being fetched from the 
internet instead of locally
-* [CXF-1438] - AttachmentDeserializer is leaving behind temp files
-* [CXF-1439] - WSDL2Java generates NPE for certain WSDL
-* [CXF-1442] - Clients only handle a single Session cookie
-* [CXF-1444] - JBIOutWrapperInterceptor fails to find objects sequentially 
-* [CXF-1446] - null pointer in java2wsld
-* [CXF-1448] - Aegis + SAAJ leads to namespace complaint.
-* [CXF-1456] - Investigate a more sensible set of default cipher suites
-* [CXF-1465] - WSDL2Java error when using  binding 
customization
-* [CXF-1467] - CXF Bug 1435 Not Resolved
-* [CXF-1468] - JBIWrapperOutInterceptor miss message type attribute for 
JBI binding
-* [CXF-1469] - NPE with Spring 2.5.2
-
-** Improvement
-* [CXF-1272] - Application doesn't start up without internet connection 
(when providing  setting)
-* [CXF-1484] - JBI binding should throw more meaningful exception instead 
of NPE when there is no operaiton in the JBI MessageExchange
-
-** New Feature
-* [CXF-490] - Create CXF OSGi Bundles
-
-
-
-
+* [CXF-918] - java code from wsdl2java for wrapped style if request and 
response have elements with the same names and different datatypes
+* [CXF-1229] - Check for element name clash in request and response 
messages ignores setting of enableWrapperStyle
+* [CXF-1388] - Error when running client generated by Wsdl2Java tool 
'org.apache.ws.commons.schema.constants.Enum$EnumValueException: Bad 
Enumeration value 'extension restriction''
+* [CXF-1445] - Missing repository definition
+* [CXF-1464] - xmlbinding error
+* [CXF-1481] - PropertyEditor for class 
"org.apache.cxf.binding.soap.SoapVersion"  is wrong
+* [

svn commit: r651332 - in /incubator/cxf/branches/2.0.x-fixes: ./ distribution/src/main/release/README

[dkulp]

Author: dkulp
Date: Thu Apr 24 11:15:48 2008
New Revision: 651332

URL: http://svn.apache.org/viewvc?rev=651332&view=rev
Log:
Merged revisions 651292 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk


  r651292 | dkulp | 2008-04-24 11:39:01 -0400 (Thu, 24 Apr 2008) | 2 lines
  
  Fix "beta" stuff and web site locations


Modified:
incubator/cxf/branches/2.0.x-fixes/   (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README

Propchange: incubator/cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README?rev=651332&r1=651331&r2=651332&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README 
(original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/README Thu 
Apr 24 11:15:48 2008
@@ -66,10 +66,10 @@
 features.
 
 Alternatively, you can also find out how to get started here:
-http://incubator.apache.org/cxf/
+http://cxf.apache.org/
 
 If you need more help try talking to us on our mailing lists:
-http://incubator.apache.org/cxf/mailing-lists.html
+http://cxf.apache.org/mailing-lists.html
  
 If you find any issues with CXF, please submit reports with JIRA here:
 https://issues.apache.org/jira/browse/CXF
@@ -77,9 +77,9 @@
 We welcome contributions, and encourage you to get involved in the CXF
 community. If you'd like to learn more about how you can contribute, please
 see:
-http://incubator.apache.org/cxf/getting-involved.html
+http://cxf.apache.org/getting-involved.html
 
 Thank you for using CXF!
 
 The Apache CXF Team
-http://incubator.apache.org/cxf/
+http://cxf.apache.org/

svn commit: r651336 [2/2] - in /incubator/cxf/trunk: ./ api/ buildtools/ common/ common/common/ common/schemas/ common/xjc/ common/xjc/dv-test/ common/xjc/dv/ common/xjc/ts-test/ common/xjc/ts/ common

[dkulp]

Modified: incubator/cxf/trunk/tools/wsdlto/core/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/pom.xml?rev=651336&r1=651335&r2=651336&view=diff
==
--- incubator/cxf/trunk/tools/wsdlto/core/pom.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/pom.xml Thu Apr 24 11:22:32 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-core
 jar
-2.1.1-SNAPSHOT
+2.1
 Apache CXF Command Line Tools WSDLTo Core
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.1.1-SNAPSHOT
+2.1
 ../../../parent/pom.xml
 
 
@@ -148,8 +148,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/core
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/core
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/core
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/core
 
 
 

Modified: incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/pom.xml?rev=651336&r1=651335&r2=651336&view=diff
==
--- incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/pom.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/pom.xml Thu Apr 24 
11:22:32 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-databinding-jaxb
 jar
-2.1.1-SNAPSHOT
+2.1
 Apache CXF Command Line Tools WSDLTo JAXB Databinding
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.1.1-SNAPSHOT
+2.1
 ../../../../parent/pom.xml
 
 
@@ -65,8 +65,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/databinding/jaxb
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/databinding/jaxb
 
 
 

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/javascript/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/javascript/pom.xml?rev=651336&r1=651335&r2=651336&view=diff
==
--- incubator/cxf/trunk/tools/wsdlto/frontend/javascript/pom.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/javascript/pom.xml Thu Apr 24 
11:22:32 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-frontend-javascript
 jar
-2.1.1-SNAPSHOT
+2.1
 Apache CXF Command Line Tools WSDL to JavaScript Front End
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.1.1-SNAPSHOT
+2.1
 ../../../../parent/pom.xml
 
 
@@ -77,8 +77,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/frontend/javascript
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/frontend/javascript
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/frontend/javascript
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/frontend/javascript
 
 
 

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/pom.xml?rev=651336&r1=651335&r2=651336&view=diff
==
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/pom.xml Thu Apr 24 11:22:32 
2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-frontend-jaxws
 jar
-2.1.1-SNAPSHOT
+2.1
 Apache CXF Command Line Tools WSDLTo JAXWS Frontend
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.1.1-SNAPSHOT
+2.1
 ../../../../parent/pom.xml
 
 
@@ -65,8 +65,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/frontend/jaxws
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/frontend/jaxws
 
 
 

Modified: incubator/cxf/trunk/tools/wsdlto/misc/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/pom.xml?rev=651336&r1=651335&r2=6513

svn commit: r651337 - /incubator/cxf/tags/cxf-2.1/

[dkulp]

Author: dkulp
Date: Thu Apr 24 11:25:29 2008
New Revision: 651337

URL: http://svn.apache.org/viewvc?rev=651337&view=rev
Log:
[maven-release-plugin]  copy for tag cxf-2.1

Added:
incubator/cxf/tags/cxf-2.1/
  - copied from r651336, incubator/cxf/trunk/

svn commit: r651339 [2/2] - in /incubator/cxf/trunk: ./ api/ buildtools/ common/ common/common/ common/schemas/ common/xjc/ common/xjc/dv-test/ common/xjc/dv/ common/xjc/ts-test/ common/xjc/ts/ common

[dkulp]

Modified: incubator/cxf/trunk/tools/wsdlto/core/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/pom.xml?rev=651339&r1=651338&r2=651339&view=diff
==
--- incubator/cxf/trunk/tools/wsdlto/core/pom.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/pom.xml Thu Apr 24 11:30:17 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-core
 jar
-2.1
+2.1.1-SNAPSHOT
 Apache CXF Command Line Tools WSDLTo Core
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.1
+2.1.1-SNAPSHOT
 ../../../parent/pom.xml
 
 
@@ -148,8 +148,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/core
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/core
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/core
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/core
 
 
 

Modified: incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/pom.xml?rev=651339&r1=651338&r2=651339&view=diff
==
--- incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/pom.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/pom.xml Thu Apr 24 
11:30:17 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-databinding-jaxb
 jar
-2.1
+2.1.1-SNAPSHOT
 Apache CXF Command Line Tools WSDLTo JAXB Databinding
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.1
+2.1.1-SNAPSHOT
 ../../../../parent/pom.xml
 
 
@@ -65,8 +65,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/databinding/jaxb
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/databinding/jaxb
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb
 
 
 

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/javascript/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/javascript/pom.xml?rev=651339&r1=651338&r2=651339&view=diff
==
--- incubator/cxf/trunk/tools/wsdlto/frontend/javascript/pom.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/javascript/pom.xml Thu Apr 24 
11:30:17 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-frontend-javascript
 jar
-2.1
+2.1.1-SNAPSHOT
 Apache CXF Command Line Tools WSDL to JavaScript Front End
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.1
+2.1.1-SNAPSHOT
 ../../../../parent/pom.xml
 
 
@@ -77,8 +77,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/frontend/javascript
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/frontend/javascript
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/frontend/javascript
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/frontend/javascript
 
 
 

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/pom.xml?rev=651339&r1=651338&r2=651339&view=diff
==
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/pom.xml Thu Apr 24 11:30:17 
2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-frontend-jaxws
 jar
-2.1
+2.1.1-SNAPSHOT
 Apache CXF Command Line Tools WSDLTo JAXWS Frontend
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.1
+2.1.1-SNAPSHOT
 ../../../../parent/pom.xml
 
 
@@ -65,8 +65,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/frontend/jaxws
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.1/tools/wsdlto/frontend/jaxws
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws
 
 
 

Modified: incubator/cxf/trunk/tools/wsdlto/misc/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/pom.xml?rev=651339&r1=651338&r2=6513

svn commit: r651340 - in /incubator/cxf/branches/2.0.x-fixes: ./ api/ buildtools/ common/ common/common/ common/schemas/ common/xjc/ common/xjc/dv-test/ common/xjc/dv/ common/xjc/ts-test/ common/xjc/t

[dkulp]

Author: dkulp
Date: Thu Apr 24 11:33:31 2008
New Revision: 651340

URL: http://svn.apache.org/viewvc?rev=651340&view=rev
Log:
Merged revisions 651298 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk


  r651298 | dkulp | 2008-04-24 11:56:20 -0400 (Thu, 24 Apr 2008) | 2 lines
  
  Point the poms to the official website now.  Update mailing lists in pom.


Modified:
incubator/cxf/branches/2.0.x-fixes/   (props changed)
incubator/cxf/branches/2.0.x-fixes/api/pom.xml
incubator/cxf/branches/2.0.x-fixes/buildtools/pom.xml
incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml
incubator/cxf/branches/2.0.x-fixes/common/pom.xml
incubator/cxf/branches/2.0.x-fixes/common/schemas/pom.xml
incubator/cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml
incubator/cxf/branches/2.0.x-fixes/common/xjc/dv/pom.xml
incubator/cxf/branches/2.0.x-fixes/common/xjc/pom.xml
incubator/cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml
incubator/cxf/branches/2.0.x-fixes/common/xjc/ts/pom.xml
incubator/cxf/branches/2.0.x-fixes/common/xsd/pom.xml
incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml
incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml
incubator/cxf/branches/2.0.x-fixes/integration/jbi/pom.xml
incubator/cxf/branches/2.0.x-fixes/integration/jca/pom.xml
incubator/cxf/branches/2.0.x-fixes/integration/pom.xml

incubator/cxf/branches/2.0.x-fixes/maven-plugins/archetypes/cxf-http-basic/pom.xml
incubator/cxf/branches/2.0.x-fixes/maven-plugins/archetypes/pom.xml
incubator/cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/pom.xml

incubator/cxf/branches/2.0.x-fixes/maven-plugins/eclipse-plugin-generator/pom.xml
incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
incubator/cxf/branches/2.0.x-fixes/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/coloc/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/http/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/object/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/core/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/frontend/js/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/management/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/transports/local/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/ws/rm/pom.xml
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml
incubator/cxf/branches/2.0.x-fixes/systests/pom.xml
incubator/cxf/branches/2.0.x-fixes/testutils/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/anttask/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/common/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/javato/core/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/javato/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/javato/test/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/validator/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/pom.xml
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/pom.xml

Propchange: incubator/cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/api/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/api/pom.xml?rev=651340&r1=651339&r2=651340&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/api/pom.xml (original)
+++ incubator/cx

svn commit: r651341 - in /incubator/cxf/branches/2.0.x-fixes: ./ STATUS

[dkulp]

Author: dkulp
Date: Thu Apr 24 11:36:20 2008
New Revision: 651341

URL: http://svn.apache.org/viewvc?rev=651341&view=rev
Log:
Merged revisions 651304 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk


  r651304 | dkulp | 2008-04-24 12:23:31 -0400 (Thu, 24 Apr 2008) | 2 lines
  
  Remove incubator checklist from STATUS


Modified:
incubator/cxf/branches/2.0.x-fixes/   (props changed)
incubator/cxf/branches/2.0.x-fixes/STATUS

Propchange: incubator/cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/STATUS
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/STATUS?rev=651341&r1=651340&r2=651341&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/STATUS (original)
+++ incubator/cxf/branches/2.0.x-fixes/STATUS Thu Apr 24 11:36:20 2008
@@ -1,84 +1,58 @@
+
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+
 ##
 ## $Rev$ $Date$
 ##
 
-Exit Criteria
-(put an X next to item when it is complete):
-
-Copyrights & Licensing
-
-X  -- Do all the software in the codebase has its copyright assigned to The
- Apache Software Foundation?
-
-X  -- Do All the software in the codebase, are licensed (or multi-licensed) 
under the
- Apache licence?
-
-X  -- Do all the software in the codebase,are compliant with the
- Specifications set by Java Community Process?(Wherever applicable)
- * This criteria has been superceded by the Exit Milestone below
-
-Distribution rights
-
-X  -- For all code included with the distribution that is not under the
- Apache license, do we have the right to combine with Apache-licensed
- code and redistribute?
-
-X  -- Is all source code distributed by the project covered by one or more
- of the following approved licenses:  Apache, BSD, Artistic, MIT/X,
- MIT/W3C, MPL 1.1, or something with essentially the same terms?
-
-Infrastructure
-
-X -- SVN modules created and committers added to avail file?
- Yes:   https://svn.apache.org/repos/asf/incubator/cxf
-
-X  -- Are the developer,commit and user mailing lists set up and archived?
-
-X  -- Bug tracking system enabled?
- Yes:   https://issues.apache.org/jira/browse/CXF
-
-X  -- wiki based documentation site enabled?
- Yes:   http://cwiki.apache.org/confluence/display/CXF/Index
-
-X  -- Has the project migrated to our infrastructure?
-
-Committers:
-
-X  -- Have all of the active long-term volunteers been identified
- and acknowledged as committers on the project?
-
-X  -- Have all the commiters signed the CLA?
-
-X  -- Do they have accounts on svn.apache.org?
-
-X  -- Are there three or more independent committers?
- Yes
-
-Collaborative Development:
-
-X  -- Are project decisions being made in public by the committers?
-
-  -- Are the decision-making guidelines published and agreed to by
- all of the committers?
-
-X  -- Does the documentation site has enough information on the architecure, 
design decisions and
- modules?
-
-  -- Has the community, the graduation/new PMC of the project to which the 
codebase and community
- will move at the end of incubation (if any), and the Incubator PMC, 
decided the
- expected time frame of stay in incubator?
-
-X  -- Has the community adopted the Apache voting rules and is otherwise 
following the Apache
- guidelines?
-
-Exit Milestone:
-
-organisational acceptance:
 
-  -- Has the board accepted moving to a existing/new PMC?
+
+ Apache CXF Status
+
+
+Apache CXF graduated from the Incubator on 04/16/2008
+Infrastructure is still working on moving resources.  SVN is the primary thing 
+left to move.
+
+
+Project

svn commit: r651343 - in /incubator/cxf/branches/2.0.x-fixes: ./ distribution/src/main/assembly/src.xml

[dkulp]

Author: dkulp
Date: Thu Apr 24 11:38:13 2008
New Revision: 651343

URL: http://svn.apache.org/viewvc?rev=651343&view=rev
Log:
Merged revisions 651305 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk


  r651305 | dkulp | 2008-04-24 12:25:54 -0400 (Thu, 24 Apr 2008) | 2 lines
  
  Remove KEYS file from distributions (no-one should ever trust that file in 
the distribution)


Modified:
incubator/cxf/branches/2.0.x-fixes/   (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml

Propchange: incubator/cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml?rev=651343&r1=651342&r2=651343&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml 
(original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml 
Thu Apr 24 11:38:13 2008
@@ -78,6 +78,7 @@
 **/var/journal
 **/build.out*
 STATUS
+KEYS
 
 
 

svn commit: r651345 - /incubator/cxf/branches/2.0.x-fixes/

[dkulp]

Author: dkulp
Date: Thu Apr 24 11:52:35 2008
New Revision: 651345

URL: http://svn.apache.org/viewvc?rev=651345&view=rev
Log:
Blocked revisions 651327,651336,651339 via svnmerge


  r651327 | dkulp | 2008-04-24 13:52:29 -0400 (Thu, 24 Apr 2008) | 2 lines
  
  Move the last remaining schema into "schemas" so we can make it "live"
....
  r651336 | dkulp | 2008-04-24 14:22:32 -0400 (Thu, 24 Apr 2008) | 1 line
  
  [maven-release-plugin] prepare release cxf-2.1
....
  r651339 | dkulp | 2008-04-24 14:30:17 -0400 (Thu, 24 Apr 2008) | 1 line
  
  [maven-release-plugin] prepare for next development iteration


Modified:
incubator/cxf/branches/2.0.x-fixes/   (props changed)

Propchange: incubator/cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-blocked' - no diff available.

svn commit: r651352 [2/2] - in /incubator/cxf/branches/2.0.x-fixes: ./ api/ buildtools/ common/ common/common/ common/schemas/ common/xjc/ common/xjc/dv-test/ common/xjc/dv/ common/xjc/ts-test/ common

[dkulp]

Modified: 
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/pom.xml?rev=651352&r1=651351&r2=651352&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/pom.xml 
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/pom.xml 
Thu Apr 24 12:17:47 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-databinding-jaxb
 jar
-2.0.6-SNAPSHOT
+2.0.6
 Apache CXF Command Line Tools WSDLTo JAXB Databinding
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.0.6-SNAPSHOT
+2.0.6
 ../../../../parent/pom.xml
 
 
@@ -65,8 +65,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/databinding/jaxb
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/databinding/jaxb
 
 
 

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/pom.xml?rev=651352&r1=651351&r2=651352&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/pom.xml 
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/pom.xml Thu 
Apr 24 12:17:47 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-frontend-jaxws
 jar
-2.0.6-SNAPSHOT
+2.0.6
 Apache CXF Command Line Tools WSDLTo JAXWS Frontend
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.0.6-SNAPSHOT
+2.0.6
 ../../../../parent/pom.xml
 
 
@@ -65,8 +65,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/frontend/jaxws
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/frontend/jaxws
 
 
 

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc/pom.xml?rev=651352&r1=651351&r2=651352&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc/pom.xml Thu Apr 24 
12:17:47 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-misctools
 jar
-2.0.6-SNAPSHOT
+2.0.6
 Apache CXF Command Line Tools WSDLTo Misctools
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.0.6-SNAPSHOT
+2.0.6
 ../../../parent/pom.xml
 
 
@@ -119,8 +119,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/misc
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/misc
 
 
 

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/pom.xml?rev=651352&r1=651351&r2=651352&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/pom.xml Thu Apr 24 12:17:47 
2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto
 pom
-2.0.6-SNAPSHOT
+2.0.6
 Apache CXF Command Line Tools WSDLTo
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-tools
-2.0.6-SNAPSHOT
+2.0.6
 
 
 
@@ -40,8 +40,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto
 
 
 

svn commit: r651355 - in /incubator/cxf/tags/cxf-2.0.6: ./ api/ buildtools/ common/ common/common/ common/schemas/ common/xjc/ common/xjc/dv-test/ common/xjc/dv/ common/xjc/ts-test/ common/xjc/ts/ com

[dkulp]

Author: dkulp
Date: Thu Apr 24 12:21:45 2008
New Revision: 651355

URL: http://svn.apache.org/viewvc?rev=651355&view=rev
Log:
[maven-release-plugin]  copy for tag cxf-2.0.6

Added:
incubator/cxf/tags/cxf-2.0.6/
  - copied from r651345, incubator/cxf/branches/2.0.x-fixes/
incubator/cxf/tags/cxf-2.0.6/api/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/api/pom.xml
incubator/cxf/tags/cxf-2.0.6/buildtools/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/buildtools/pom.xml
incubator/cxf/tags/cxf-2.0.6/common/common/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml
incubator/cxf/tags/cxf-2.0.6/common/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/common/pom.xml
incubator/cxf/tags/cxf-2.0.6/common/schemas/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/common/schemas/pom.xml
incubator/cxf/tags/cxf-2.0.6/common/xjc/dv-test/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml
incubator/cxf/tags/cxf-2.0.6/common/xjc/dv/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/common/xjc/dv/pom.xml
incubator/cxf/tags/cxf-2.0.6/common/xjc/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/common/xjc/pom.xml
incubator/cxf/tags/cxf-2.0.6/common/xjc/ts-test/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml
incubator/cxf/tags/cxf-2.0.6/common/xjc/ts/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/common/xjc/ts/pom.xml
incubator/cxf/tags/cxf-2.0.6/common/xsd/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/common/xsd/pom.xml
incubator/cxf/tags/cxf-2.0.6/distribution/bundle/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
incubator/cxf/tags/cxf-2.0.6/distribution/manifest/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/distribution/manifest/pom.xml
incubator/cxf/tags/cxf-2.0.6/distribution/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml
incubator/cxf/tags/cxf-2.0.6/integration/jbi/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/integration/jbi/pom.xml
incubator/cxf/tags/cxf-2.0.6/integration/jca/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/integration/jca/pom.xml
incubator/cxf/tags/cxf-2.0.6/integration/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/integration/pom.xml
incubator/cxf/tags/cxf-2.0.6/maven-plugins/archetypes/cxf-http-basic/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/maven-plugins/archetypes/cxf-http-basic/pom.xml
incubator/cxf/tags/cxf-2.0.6/maven-plugins/archetypes/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/maven-plugins/archetypes/pom.xml
incubator/cxf/tags/cxf-2.0.6/maven-plugins/codegen-plugin/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/pom.xml
incubator/cxf/tags/cxf-2.0.6/maven-plugins/eclipse-plugin-generator/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/maven-plugins/eclipse-plugin-generator/pom.xml
incubator/cxf/tags/cxf-2.0.6/parent/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
incubator/cxf/tags/cxf-2.0.6/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/pom.xml
incubator/cxf/tags/cxf-2.0.6/rt/bindings/coloc/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/coloc/pom.xml
incubator/cxf/tags/cxf-2.0.6/rt/bindings/http/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/http/pom.xml
incubator/cxf/tags/cxf-2.0.6/rt/bindings/jbi/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml
incubator/cxf/tags/cxf-2.0.6/rt/bindings/object/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/object/pom.xml
incubator/cxf/tags/cxf-2.0.6/rt/bindings/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/pom.xml
incubator/cxf/tags/cxf-2.0.6/rt/bindings/soap/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/pom.xml
incubator/cxf/tags/cxf-2.0.6/rt/bindings/xml/pom.xml
  - copied unchanged from r651352, 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/pom

svn commit: r651356 [2/2] - in /incubator/cxf/branches/2.0.x-fixes: ./ api/ buildtools/ common/ common/common/ common/schemas/ common/xjc/ common/xjc/dv-test/ common/xjc/dv/ common/xjc/ts-test/ common

[dkulp]

Modified: 
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/pom.xml?rev=651356&r1=651355&r2=651356&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/pom.xml 
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/pom.xml 
Thu Apr 24 12:28:54 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-databinding-jaxb
 jar
-2.0.6
+2.0.7-SNAPSHOT
 Apache CXF Command Line Tools WSDLTo JAXB Databinding
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.0.6
+2.0.7-SNAPSHOT
 ../../../../parent/pom.xml
 
 
@@ -65,8 +65,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/databinding/jaxb
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/databinding/jaxb
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb
 
 
 

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/pom.xml?rev=651356&r1=651355&r2=651356&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/pom.xml 
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/pom.xml Thu 
Apr 24 12:28:54 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto-frontend-jaxws
 jar
-2.0.6
+2.0.7-SNAPSHOT
 Apache CXF Command Line Tools WSDLTo JAXWS Frontend
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.0.6
+2.0.7-SNAPSHOT
 ../../../../parent/pom.xml
 
 
@@ -65,8 +65,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/frontend/jaxws
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/frontend/jaxws
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws
 
 
 

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc/pom.xml?rev=651356&r1=651355&r2=651356&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc/pom.xml Thu Apr 24 
12:28:54 2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-misctools
 jar
-2.0.6
+2.0.7-SNAPSHOT
 Apache CXF Command Line Tools WSDLTo Misctools
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-parent
-2.0.6
+2.0.7-SNAPSHOT
 ../../../parent/pom.xml
 
 
@@ -119,8 +119,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/misc
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto/misc
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/misc
 
 
 

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/pom.xml?rev=651356&r1=651355&r2=651356&view=diff
==
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/pom.xml Thu Apr 24 12:28:54 
2008
@@ -21,14 +21,14 @@
 org.apache.cxf
 cxf-tools-wsdlto
 pom
-2.0.6
+2.0.7-SNAPSHOT
 Apache CXF Command Line Tools WSDLTo
 http://cxf.apache.org
 
 
 org.apache.cxf
 cxf-tools
-2.0.6
+2.0.7-SNAPSHOT
 
 
 
@@ -40,8 +40,8 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto
-
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.6/tools/wsdlto
+
scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto
+
scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto
 
 
 

svn commit: r652127 - in /cxf/trunk/rt: core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

[dkulp]

Author: dkulp
Date: Tue Apr 29 14:10:44 2008
New Revision: 652127

URL: http://svn.apache.org/viewvc?rev=652127&view=rev
Log:
[CXF-1553] Fix problem of not setting namespace aware for all Stax parsers
Fix an issue with the ObjectFactory cache not actually working correctly

Modified:

cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java

cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

Modified: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java?rev=652127&r1=652126&r2=652127&view=diff
==
--- 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 (original)
+++ 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 Tue Apr 29 14:10:44 2008
@@ -85,6 +85,7 @@
 }
 
 try {
+
nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespaces";, true); 
 
nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes";,
 
true);
 } catch (Exception e) {

Modified: 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=652127&r1=652126&r2=652127&view=diff
==
--- 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 (original)
+++ 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 Tue Apr 29 14:10:44 2008
@@ -461,6 +461,8 @@
 OBJECT_FACTORY_CACHE.put(objectFactoryClassName, 
  new CachedClassOrNull(null));
 }
+} else {
+objectFactories.add(ofactory);
 }
 }
 }

svn commit: r652133 - /cxf/branches/2.0.x-fixes/

[dkulp]

Author: dkulp
Date: Tue Apr 29 14:18:05 2008
New Revision: 652133

URL: http://svn.apache.org/viewvc?rev=652133&view=rev
Log:
Set the svnmerge.py properties to point to non-incubator location

Modified:
cxf/branches/2.0.x-fixes/   (props changed)

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-blocked' - no diff available.

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

svn commit: r652136 - in /cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins: IDLToWSDLOption.java IDLToWSDLPlugin.java IdltowsdlOption.java WSDLToIDLOption.ja

[dkulp]

Author: dkulp
Date: Tue Apr 29 14:18:35 2008
New Revision: 652136

URL: http://svn.apache.org/viewvc?rev=652136&view=rev
Log:
Workaround issues on OSX/Windows where maven looks for the wrong class names

Added:

cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
  - copied, changed from r652125, 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLOption.java

cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java
  - copied, changed from r652125, 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLOption.java
Removed:

cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLOption.java

cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLOption.java
Modified:

cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java

cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java

Modified: 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java?rev=652136&r1=652135&r2=652136&view=diff
==
--- 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
 (original)
+++ 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
 Tue Apr 29 14:18:35 2008
@@ -44,7 +44,7 @@
 /**
  * @parameter
  */
-IDLToWSDLOption idltowsdlOptions[];
+IdltowsdlOption idltowsdlOptions[];
 
 
 public void execute() throws MojoExecutionException {

Copied: 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
 (from r652125, 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLOption.java)
URL: 
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java?p2=cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java&p1=cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLOption.java&r1=652125&r2=652136&rev=652136&view=diff
==
--- 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLOption.java
 (original)
+++ 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
 Tue Apr 29 14:18:35 2008
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-public class IDLToWSDLOption {
+public class IdltowsdlOption {
 
 String idl;
 List extraargs;

Modified: 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java?rev=652136&r1=652135&r2=652136&view=diff
==
--- 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
 (original)
+++ 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
 Tue Apr 29 14:18:35 2008
@@ -54,7 +54,7 @@
 /**
  * @parameter
  */
-WSDLToIDLOption wsdltoidlOptions[];
+WsdltoidlOption wsdltoidlOptions[];
 
 /**
  * @parameter expression="${project}"

Copied: 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java
 (from r652125, 
cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLOption.java)
URL: 
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java?p2=cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java&p1=cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLOption.java&r1=652125&r2=652136&rev=652136&view=diff
==
--- 
cxf/t

svn commit: r652139 - in /cxf/branches/2.0.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/ rt/transports/jm

[dkulp]

Author: dkulp
Date: Tue Apr 29 14:20:55 2008
New Revision: 652139

URL: http://svn.apache.org/viewvc?rev=652139&view=rev
Log:
Merged revisions 651961 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r651961 | ningjiang | 2008-04-27 10:44:19 -0400 (Sun, 27 Apr 2008) | 1 line
  
  CXF-1552 Fixed the bus resource injection error when not using Spring, also 
changed the comment in CXFNonSpringServlet


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java

cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java

cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-blocked' - no diff available.

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java?rev=652139&r1=652138&r2=652139&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
 Tue Apr 29 14:20:55 2008
@@ -28,7 +28,7 @@
 import org.apache.cxf.resource.ResourceManager;
 
 public class CXFNonSpringServlet extends AbstractCXFServlet {
-
+
 public static Logger getLogger() {
 return LogUtils.getL7dLogger(CXFNonSpringServlet.class);
 }
@@ -36,11 +36,11 @@
 @Override
 public void loadBus(ServletConfig servletConfig) throws ServletException {
 loadBusNoConfig(servletConfig);
-//TODO do we need to privde the SUN's endpoint discription file 
supporting
+// You could add the endpoint publish codes here
 }
-
+
 private void loadBusNoConfig(ServletConfig servletConfig) throws 
ServletException {
-
+
 if (bus == null) {
 LOG.info("LOAD_BUS_WITHOUT_APPLICATION_CONTEXT");
 bus = BusFactory.newInstance().createBus();
@@ -48,11 +48,11 @@
 ResourceManager resourceManager = 
bus.getExtension(ResourceManager.class);
 resourceManager.addResourceResolver(new ServletContextResourceResolver(

servletConfig.getServletContext()));
-
+
 replaceDestinationFactory();
 // Set up the ServletController
 controller = createServletController(servletConfig);
-
+
 }
 
 }

Modified: 
cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java?rev=652139&r1=652138&r2=652139&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
 Tue Apr 29 14:20:55 2008
@@ -46,33 +46,33 @@
 
 public class JBITransportFactory extends AbstractTransportFactory implements 
ConduitInitiator,
 DestinationFactory {
-
+
 public static final String TRANSPORT_ID = 
"http://cxf.apache.org/transports/jbi";;
-
+
 private static final Logger LOG = 
LogUtils.getL7dLogger(JBITransportFactory.class);
 
 
 private DeliveryChannel deliveryChannel;
 private Bus bus;
 private final Map destinationMap =  new 
HashMap();
-
+
 
 private Collection activationNamespaces;
-
-@Resource
+
+@Resource(name = "bus")
 public void setBus(Bus b) {
 bus = b;
 }
-
+
 public Bus getBus() {
 return bus;
 }
-
+
 public Set getUriPrefixes() {
 return Collections.singleton("jbi");
 }
 
-@Resource
+
 public void setActivationNamespaces(Collection ans) {
 activationNamespaces = ans;
 }
@@ -97,9 +97,9 @@
 }
 }
 
-
 
-
+
+
 public DeliveryChannel getDeliveryChannel() {
 return deliveryChannel;
 }
@@ -124,8 

svn commit: r652141 - in /cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.ja

[dkulp]

Author: dkulp
Date: Tue Apr 29 14:22:12 2008
New Revision: 652141

URL: http://svn.apache.org/viewvc?rev=652141&view=rev
Log:
Merged revisions 652127 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r652127 | dkulp | 2008-04-29 17:10:44 -0400 (Tue, 29 Apr 2008) | 3 lines
  
  [CXF-1553] Fix problem of not setting namespace aware for all Stax parsers
  Fix an issue with the ObjectFactory cache not actually working correctly


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java

cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java?rev=652141&r1=652140&r2=652141&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 Tue Apr 29 14:22:12 2008
@@ -74,6 +74,7 @@
 }
 
 try {
+
nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespaces";, true); 
 
nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes";,
 
true);
 } catch (Exception e) {

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=652141&r1=652140&r2=652141&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 Tue Apr 29 14:22:12 2008
@@ -442,6 +442,8 @@
 OBJECT_FACTORY_CACHE.put(objectFactoryClassName, 
  new CachedClassOrNull(null));
 }
+} else {
+objectFactories.add(ofactory);
 }
 }
 }

svn commit: r652503 - in /cxf/trunk: api/src/main/java/org/apache/cxf/databinding/ api/src/main/java/org/apache/cxf/message/ api/src/main/java/org/apache/cxf/service/model/ api/src/main/java/org/apach

[dkulp]

Author: dkulp
Date: Thu May  1 05:56:20 2008
New Revision: 652503

URL: http://svn.apache.org/viewvc?rev=652503&view=rev
Log:
[CXF-1560, CXF-1559, CXF-1558, CXF-1546]
* Fix some syncronization issues around the schema access
* Fix cdata outputting in StaxUtils
* Add support for querying the Attachments from client side with JAX-WS
* Fix support for Sets when ASM is found


Modified:

cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java
cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java

cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java

cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java

cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java

cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java

cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=652503&r1=652502&r2=652503&view=diff
==
--- 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
(original)
+++ 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
Thu May  1 05:56:20 2008
@@ -89,8 +89,11 @@
 }
 SchemaInfo schema = new SchemaInfo(serviceInfo, ns);
 schema.setSystemId(systemId);
-XmlSchema xmlSchema = col.read(d, systemId, null);
-schema.setSchema(xmlSchema);
+XmlSchema xmlSchema;
+synchronized (d) {
+xmlSchema = col.read(d, systemId, null);
+schema.setSchema(xmlSchema);
+}
 serviceInfo.addSchema(schema);
 return xmlSchema;
 }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java?rev=652503&r1=652502&r2=652503&view=diff
==
--- cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java Thu May  1 
05:56:20 2008
@@ -57,6 +57,7 @@
 String ENCODING = Message.class.getName() + ".ENCODING";
 String FIXED_PARAMETER_ORDER = Message.class.getName() + 
"FIXED_PARAMETER_ORDER";
 String MAINTAIN_SESSION = Message.class.getName() + ".MAINTAIN_SESSION";
+String ATTACHMENTS = Message.class.getName() + ".ATTACHMENTS";
 
 String WSDL_DESCRIPTION = "javax.xml.ws.wsdl.description";
 String WSDL_SERVICE = "javax.xml.ws.wsdl.service";

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java?rev=652503&r1=652502&r2=652503&view=diff
==
--- cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java 
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java Thu May 
 1 05:56:20 2008
@@ -49,6 +49,7 @@
 
 public void setAttachments(Collection attachments) {
 this.attachments = attachments;
+put(ATTACHMENTS, attachments);
 }
 
 public String getAttachmentMimeType() {

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java?rev=652503&r1=652502&r2=652503&view=diff
==
--- cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java 
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java 
Thu May  1 05:56:20 2008
@@ -76,10 +76,13 @@
 this.namespaceUri = nsUri;
 }
 
-public Element ge

svn commit: r652536 - in /cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/message/ api/src/main/java/org/apache/cxf/service/model/ api/src/main/java/org/apache/cxf/wsdl/ common/common/sr

[dkulp]

Author: dkulp
Date: Thu May  1 07:42:38 2008
New Revision: 652536

URL: http://svn.apache.org/viewvc?rev=652536&view=rev
Log:
Merged revisions 652503 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r652503 | dkulp | 2008-05-01 08:56:20 -0400 (Thu, 01 May 2008) | 7 lines
  
  [CXF-1560, CXF-1559, CXF-1546]
  * Fix some syncronization issues around the schema access
  * Fix cdata outputting in StaxUtils
  * Add support for querying the Attachments from client side with JAX-WS


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java

cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java

cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java

cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java

cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java

cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java

cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java

cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java

cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java

cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java

cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java?rev=652536&r1=652535&r2=652536&view=diff
==
--- 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java 
(original)
+++ 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java 
Thu May  1 07:42:38 2008
@@ -56,6 +56,7 @@
 String ENCODING = Message.class.getName() + ".ENCODING";
 String FIXED_PARAMETER_ORDER = Message.class.getName() + 
"FIXED_PARAMETER_ORDER";
 String MAINTAIN_SESSION = Message.class.getName() + ".MAINTAIN_SESSION";
+String ATTACHMENTS = Message.class.getName() + ".ATTACHMENTS";
 
 String WSDL_DESCRIPTION = "javax.xml.ws.wsdl.description";
 String WSDL_SERVICE = "javax.xml.ws.wsdl.service";

Modified: 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java?rev=652536&r1=652535&r2=652536&view=diff
==
--- 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java
 Thu May  1 07:42:38 2008
@@ -47,6 +47,7 @@
 
 public void setAttachments(Collection attachments) {
 this.attachments = attachments;
+put(ATTACHMENTS, attachments);
 }
 
 public String getAttachmentMimeType() {

Modified: 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java?rev=652536&r1=652535&r2=652536&view=diff
==
--- 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
 Thu May  1 07:42:38 2008
@@ -76,10 +76,13 @@
 this.namespaceUri = nsUri;
 }
 
-public Element getElement() {
+public synchronized Element getElement() {
 if (element == null && getSchema() != null) {
 CachedOutputStream cout = new CachedOutputStream();
-getSchema().write(cout);
+XmlSchema sch = getSchema();
+synchronized (sch) {
+getSchema().write(cout);
+}
 Document sdoc = null;
 try {
 sdoc = XMLUtils.parse(cout.getInputStream());

Modified: 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/Endpoin

svn commit: r652551 - in /cxf/trunk: api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java

[dkulp]

Author: dkulp
Date: Thu May  1 08:14:31 2008
New Revision: 652551

URL: http://svn.apache.org/viewvc?rev=652551&view=rev
Log:
Make validation tests just allow exceptions to propogate up to JUnit instead of 
printStackTrace()
Stop using NodeList in AbstractDataBinging as NodeLists are aparently not 
threadsafe in xerces.

Modified:

cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java

cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=652551&r1=652550&r2=652551&view=diff
==
--- 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
(original)
+++ 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
Thu May  1 08:14:31 2008
@@ -32,7 +32,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
@@ -76,9 +75,8 @@
 d.getDocumentElement().setAttribute("targetNamespace", ns);
 }
 
-NodeList nodes = d.getDocumentElement().getChildNodes();
-for (int i = 0; i < nodes.getLength(); i++) {
-Node n = nodes.item(i);
+Node n = d.getDocumentElement().getFirstChild();
+while (n != null) { 
 if (n instanceof Element) {
 Element e = (Element)n;
 if (e.getLocalName().equals("import")) {
@@ -86,6 +84,7 @@
 updateSchemaLocation(e);
 }
 }
+n = n.getNextSibling();
 }
 SchemaInfo schema = new SchemaInfo(serviceInfo, ns);
 schema.setSystemId(systemId);

Modified: 
cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?rev=652551&r1=652550&r2=652551&view=diff
==
--- 
cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
 (original)
+++ 
cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
 Thu May  1 08:14:31 2008
@@ -33,191 +33,123 @@
 }
 
 @Test
-public void testValidateUniqueBody() {
-try {
-
-String[] args = new String[] {"-verbose", 
getLocation("/validator_wsdl/doc_lit_bare.wsdl")};
-WSDLValidator.main(args);
-assertTrue("Non Unique Body Parts Error should be discovered: " + 
getStdErr(),
-   getStdErr().indexOf("Non unique body part") > -1);
-} catch (Exception e) {
-e.printStackTrace();
-}
+public void testValidateUniqueBody() throws Exception {
+String[] args = new String[] {"-verbose", 
getLocation("/validator_wsdl/doc_lit_bare.wsdl")};
+WSDLValidator.main(args);
+assertTrue("Non Unique Body Parts Error should be discovered: " + 
getStdErr(),
+   getStdErr().indexOf("Non unique body part") > -1);
 }
 
 @Test
-public void testValidateMixedStyle() {
-try {
-
-String[] args = new String[] {"-verbose",
-  
getLocation("/validator_wsdl/hello_world_mixed_style.wsdl")};
-WSDLValidator.main(args);
-assertTrue("Mixed style. Error should have been discovered: " + 
getStdErr(),
-   getStdErr().indexOf("Mixed style, invalid WSDL") > -1);
-
-} catch (Exception e) {
-e.printStackTrace();
-}
+public void testValidateMixedStyle() throws Exception {
+String[] args = new String[] {"-verbose",
+  
getLocation("/validator_wsdl/hello_world_mixed_style.wsdl")};
+WSDLValidator.main(args);
+assertTrue("Mixed style. Error should have been discovered: " + 
getStdErr(),
+   getStdErr().indexOf("Mixed style, invalid WSDL") > -1);
 }
 
 @Test
-public void testValidateTypeElement() {
-try {
-
-String[] args = new String[] {"-verbose",
-  
getLocation("/validator_wsdl/hello_world_doc_lit_type.wsdl")};
-WSDLValidator.main(args);
-assertTrue("Must refe

svn commit: r652580 - in /cxf/branches/2.0.x-fixes: ./ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java

[dkulp]

Author: dkulp
Date: Thu May  1 10:00:43 2008
New Revision: 652580

URL: http://svn.apache.org/viewvc?rev=652580&view=rev
Log:
Merged revisions 652552 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r652552 | bimargulies | 2008-05-01 11:14:37 -0400 (Thu, 01 May 2008) | 2 lines
  
  Fix CXF-1564


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java?rev=652580&r1=652579&r2=652580&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
 Thu May  1 10:00:43 2008
@@ -266,8 +266,10 @@
 } else {
 type.writeObject(value, cwriter, context);
 }
-
-cwriter.close();
+
+if (type.isWriteOuter()) {
+cwriter.close();
+}
 }
 
 @Override

svn commit: r652869 - in /cxf/trunk: rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customizati

[dkulp]

Author: dkulp
Date: Fri May  2 11:43:39 2008
New Revision: 652869

URL: http://svn.apache.org/viewvc?rev=652869&view=rev
Log:
[CXF-1565, CXF-1567] Fix problems with NPE in DynamicClientFactory as well as a 
bunch of issues with JAXB binding files

Modified:

cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java

cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java

Modified: 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=652869&r1=652868&r2=652869&view=diff
==
--- 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 (original)
+++ 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 Fri May  2 11:43:39 2008
@@ -364,7 +364,10 @@
 throws URISyntaxException, IOException {
 
 JarFile jar = new JarFile(file);
-Attributes attr = jar.getManifest().getMainAttributes();
+Attributes attr = null;
+if (jar.getManifest() != null) {
+attr = jar.getManifest().getMainAttributes();
+}
 if (attr != null) {
 String cp = attr.getValue("Class-Path");
 while (cp != null) {

Modified: 
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=652869&r1=652868&r2=652869&view=diff
==
--- 
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
 (original)
+++ 
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
 Fri May  2 11:43:39 2008
@@ -50,6 +50,7 @@
 import org.apache.cxf.helpers.MapNamespaceContext;
 import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.resource.URIResolver;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.ToolException;
@@ -184,15 +185,28 @@
 private Node[] getAnnotationNodes(final Node node) {
 Node[] nodes = new Node[2];
 
-Node annotationNode = nodeSelector.queryNode(node, "//xsd:annotation");
-
+Node annotationNode = node.getFirstChild();
+while (annotationNode != null) {
+if ("annotation".equals(annotationNode.getLocalName())
+&& 
ToolConstants.SCHEMA_URI.equals(annotationNode.getNamespaceURI())) {
+break;
+}
+annotationNode = annotationNode.getNextSibling();
+}
 if (annotationNode == null) {
 annotationNode = 
node.getOwnerDocument().createElementNS(ToolConstants.SCHEMA_URI, "annotation");
 }
 
 nodes[0] = annotationNode;
 
-Node appinfoNode = nodeSelector.queryNode(annotationNode, 
"//xsd:appinfo");
+Node appinfoNode = annotationNode.getFirstChild();
+while (appinfoNode != null) {
+if ("appinfo".equals(appinfoNode.getLocalName())
+&& 
ToolConstants.SCHEMA_URI.equals(appinfoNode.getNamespaceURI())) {
+break;
+}
+appinfoNode = appinfoNode.getNextSibling();
+}
 
 if (appinfoNode == null) {
 appinfoNode = 
node.getOwnerDocument().createElementNS(ToolConstants.SCHEMA_URI, "appinfo");
@@ -211,32 +225,32 @@
 }
 
 protected void copyAllJaxbDeclarations(final Node schemaNode, final 
Element jaxwsBindingNode) {
-Element jaxbBindingElement = getJaxbBindingElement(jaxwsBindingNode);
 appendJaxbVersion((Element)schemaNode);
-if (jaxbBindingElement != null) {
-NodeList nlist = nodeSelector.queryNodes(schemaNode, 
jaxbBindingElement.getAttribute("node"));
-for (int i = 0; i < nlist.getLength(); i++) {
-Node node = nlist.item(i);
-copyAllJaxbDeclarations(node, jaxbBindingElement);
-}
-return;
-}
 
 Node[] embededNodes = getAnnotationNodes(schemaNod

svn commit: r652873 - in /cxf/branches/2.0.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/

[dkulp]

Author: dkulp
Date: Fri May  2 12:02:38 2008
New Revision: 652873

URL: http://svn.apache.org/viewvc?rev=652873&view=rev
Log:
Merged revisions 652869 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r652869 | dkulp | 2008-05-02 14:43:39 -0400 (Fri, 02 May 2008) | 2 lines
  
  [CXF-1565] Fix a bunch of issues with JAXB binding files


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java

cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=652873&r1=652872&r2=652873&view=diff
==
--- 
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
 Fri May  2 12:02:38 2008
@@ -50,6 +50,7 @@
 import org.apache.cxf.helpers.MapNamespaceContext;
 import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.resource.URIResolver;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.ToolException;
@@ -184,15 +185,28 @@
 private Node[] getAnnotationNodes(final Node node) {
 Node[] nodes = new Node[2];
 
-Node annotationNode = nodeSelector.queryNode(node, "//xsd:annotation");
-
+Node annotationNode = node.getFirstChild();
+while (annotationNode != null) {
+if ("annotation".equals(annotationNode.getLocalName())
+&& 
ToolConstants.SCHEMA_URI.equals(annotationNode.getNamespaceURI())) {
+break;
+}
+annotationNode = annotationNode.getNextSibling();
+}
 if (annotationNode == null) {
 annotationNode = 
node.getOwnerDocument().createElementNS(ToolConstants.SCHEMA_URI, "annotation");
 }
 
 nodes[0] = annotationNode;
 
-Node appinfoNode = nodeSelector.queryNode(annotationNode, 
"//xsd:appinfo");
+Node appinfoNode = annotationNode.getFirstChild();
+while (appinfoNode != null) {
+if ("appinfo".equals(appinfoNode.getLocalName())
+&& 
ToolConstants.SCHEMA_URI.equals(appinfoNode.getNamespaceURI())) {
+break;
+}
+appinfoNode = appinfoNode.getNextSibling();
+}
 
 if (appinfoNode == null) {
 appinfoNode = 
node.getOwnerDocument().createElementNS(ToolConstants.SCHEMA_URI, "appinfo");
@@ -211,32 +225,32 @@
 }
 
 protected void copyAllJaxbDeclarations(final Node schemaNode, final 
Element jaxwsBindingNode) {
-Element jaxbBindingElement = getJaxbBindingElement(jaxwsBindingNode);
 appendJaxbVersion((Element)schemaNode);
-if (jaxbBindingElement != null) {
-NodeList nlist = nodeSelector.queryNodes(schemaNode, 
jaxbBindingElement.getAttribute("node"));
-for (int i = 0; i < nlist.getLength(); i++) {
-Node node = nlist.item(i);
-copyAllJaxbDeclarations(node, jaxbBindingElement);
-}
-return;
-}
 
 Node[] embededNodes = getAnnotationNodes(schemaNode);
 Node annotationNode = embededNodes[0];
 Node appinfoNode = embededNodes[1];
-
-NodeList childNodes = jaxwsBindingNode.getChildNodes();
-for (int i = 0; i < childNodes.getLength(); i++) {
-Node childNode = childNodes.item(i);
-if (!isJaxbBindings(childNode) || 
isJaxbBindingsElement(childNode)) {
+
+for (Node childNode = jaxwsBindingNode.getFirstChild();
+childNode != null;
+childNode = childNode.getNextSibling()) {
+if (!isJaxbBindings(childNode)) {
 continue;
 }
-
-final Node jaxbNode = childNode;
-
-Node cloneNode = 
ProcessorUtil.cloneNode(schemaNode.getOwnerDocument(), jaxbNode, t

svn commit: r652899 - in /cxf/trunk/rt: databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInter

[dkulp]

Author: dkulp
Date: Fri May  2 13:36:13 2008
New Revision: 652899

URL: http://svn.apache.org/viewvc?rev=652899&view=rev
Log:
[CXF-1556] Reduce logging level in JAXRS
Also change protection on a method in aegis that is seeming to invoke a bug in 
the latest PMD or checkstyle plugin in eclipse.

Modified:

cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java

cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java

Modified: 
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java?rev=652899&r1=652898&r2=652899&view=diff
==
--- 
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
 (original)
+++ 
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
 Fri May  2 13:36:13 2008
@@ -295,7 +295,7 @@
 return null;
 }
 
-private static Object getAnnotationValue(String name,
+Object getAnnotationValue(String name,
 Method method,
 int index,
 Object ignoredValue,

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java?rev=652899&r1=652898&r2=652899&view=diff
==
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
 Fri May  2 13:36:13 2008
@@ -123,7 +123,7 @@

requestContentType,

acceptContentTypes));
 }
-LOG.info("Found operation: " + ori.getMethod().getName());
+LOG.fine("Found operation: " + ori.getMethod().getName());
 
 message.getExchange().put(OperationResourceInfo.class, ori);
 message.put(RELATIVE_PATH, 
values.getFirst(URITemplate.FINAL_MATCH_GROUP));

svn commit: r652916 - in /cxf/trunk: api/src/main/java/org/apache/cxf/BusFactory.java rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory

[dkulp]

Author: dkulp
Date: Fri May  2 14:13:58 2008
New Revision: 652916

URL: http://svn.apache.org/viewvc?rev=652916&view=rev
Log:
[CXF-1562] Allow grabbing factory via META-INF/cxf package

Added:
cxf/trunk/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java?rev=652916&r1=652915&r2=652916&view=diff
==
--- cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java Fri May  2 
14:13:58 2008
@@ -195,6 +195,21 @@
 } else {
 is = classLoader.getResourceAsStream(serviceId);
 }
+if (is == null) {
+serviceId = "META-INF/cxf/" + 
BusFactory.BUS_FACTORY_PROPERTY_NAME;
+
+if (classLoader == null) {
+classLoader = 
Thread.currentThread().getContextClassLoader();
+}
+
+if (classLoader == null) {
+is = ClassLoader.getSystemResourceAsStream(serviceId);
+} else {
+is = classLoader.getResourceAsStream(serviceId);
+}
+}
+
+
 if (is != null) {
 BufferedReader rd = new BufferedReader(new 
InputStreamReader(is, "UTF-8"));
 busFactoryClass = rd.readLine();
@@ -228,3 +243,4 @@
 }
 
 }
+ 
\ No newline at end of file

Added: 
cxf/trunk/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory?rev=652916&view=auto
==
--- 
cxf/trunk/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory 
(added)
+++ 
cxf/trunk/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory 
Fri May  2 14:13:58 2008
@@ -0,0 +1,2 @@
+org.apache.cxf.bus.spring.SpringBusFactory
+org.springframework.context.ApplicationContext
\ No newline at end of file

svn commit: r652923 - in /cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/BusFactory.java rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory

[dkulp]

Author: dkulp
Date: Fri May  2 14:50:45 2008
New Revision: 652923

URL: http://svn.apache.org/viewvc?rev=652923&view=rev
Log:
Merged revisions 652916 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r652916 | dkulp | 2008-05-02 17:13:58 -0400 (Fri, 02 May 2008) | 2 lines
  
  [CXF-1562] Allow grabbing factory via META-INF/cxf package


Added:

cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory
  - copied unchanged from r652916, 
cxf/trunk/rt/core/src/main/resources/META-INF/cxf/org.apache.cxf.bus.factory
Modified:
cxf/branches/2.0.x-fixes/   (props changed)
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java?rev=652923&r1=652922&r2=652923&view=diff
==
--- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java 
(original)
+++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java 
Fri May  2 14:50:45 2008
@@ -195,6 +195,21 @@
 } else {
 is = classLoader.getResourceAsStream(serviceId);
 }
+if (is == null) {
+serviceId = "META-INF/cxf/" + 
BusFactory.BUS_FACTORY_PROPERTY_NAME;
+
+if (classLoader == null) {
+classLoader = 
Thread.currentThread().getContextClassLoader();
+}
+
+if (classLoader == null) {
+is = ClassLoader.getSystemResourceAsStream(serviceId);
+} else {
+is = classLoader.getResourceAsStream(serviceId);
+}
+}
+
+
 if (is != null) {
 BufferedReader rd = new BufferedReader(new 
InputStreamReader(is, "UTF-8"));
 busFactoryClass = rd.readLine();
@@ -228,3 +243,4 @@
 }
 
 }
+ 
\ No newline at end of file

svn commit: r654878 - in /cxf/branches/2.0.x-fixes: ./ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java

[dkulp]

Author: dkulp
Date: Fri May  9 09:33:28 2008
New Revision: 654878

URL: http://svn.apache.org/viewvc?rev=654878&view=rev
Log:
Merged revisions 652943 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r652943 | bimargulies | 2008-05-02 18:57:19 -0400 (Fri, 02 May 2008) | 3 lines
  
  Add a service configuration that sets a soap action for suffering OC4J 
  user.


Added:

cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java
  - copied unchanged from r652943, 
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java
Modified:
cxf/branches/2.0.x-fixes/   (props changed)

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

svn commit: r654887 - in /cxf/branches/2.0.x-fixes: ./ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ rt/da

[dkulp]

Author: dkulp
Date: Fri May  9 10:06:14 2008
New Revision: 654887

URL: http://svn.apache.org/viewvc?rev=654887&view=rev
Log:
Merged revisions 654662 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r654662 | bimargulies | 2008-05-08 21:37:42 -0400 (Thu, 08 May 2008) | 2 lines
  
  Fix to CXF-1569, I think.


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java

cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.aegis.xml

cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java

cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java

cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java?rev=654887&r1=654886&r2=654887&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
 Fri May  9 10:06:14 2008
@@ -37,7 +37,6 @@
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -70,12 +69,7 @@
 clientInterface = (MapTest)proxyFac.create(); 
 }
 
-@Ignore
 @Test
-/**
- * Until some issues in CXF-1051 are resolved, it's not clear what to test 
in here. 
- * 
- */
 public void testMapWsdl() throws WSDLException {
 @SuppressWarnings("unused")
 //Document wsdl = getWSDLDocument("MapTestService");

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.aegis.xml
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.aegis.xml?rev=654887&r1=654886&r2=654887&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.aegis.xml
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.aegis.xml
 Fri May  9 10:06:14 2008
@@ -20,10 +20,13 @@
 


-   
+   
+   
+   
+ 


-   
+   


 
\ No newline at end of file

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java?rev=654887&r1=654886&r2=654887&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
 Fri May  9 10:06:14 2008
@@ -34,6 +34,7 @@
 ObjectWithAMap returnObjectWithAMap();
 void takeMap(ObjectWithAMap map);
 Map getMapStringToLong();
+Map getRawMapStringToInteger();
 Map getMapLongToString();
 
 ObjectWithAMapNs2 returnObjectWithAMapNs2();

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java?rev=654887&r1=654886&r2=654887&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java
 Fri Ma

svn commit: r654889 - in /cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/io/CachedOutputStream.java

[dkulp]

Author: dkulp
Date: Fri May  9 10:11:29 2008
New Revision: 654889

URL: http://svn.apache.org/viewvc?rev=654889&view=rev
Log:
Merged revisions 654663 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r654663 | bimargulies | 2008-05-08 21:43:02 -0400 (Thu, 08 May 2008) | 2 lines
  
  Fix CXF-1571.


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java?rev=654889&r1=654888&r2=654889&view=diff
==
--- 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
 Fri May  9 10:11:29 2008
@@ -267,7 +267,7 @@
 int x = fin.read(bytes);
 while (x != -1) {
 if ((count + x) > limit) {
-x = count - limit;
+x = limit - count;
 }
 out.append(new String(bytes, 0, x));
 count += x;

svn commit: r654899 - /cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java

[dkulp]

Author: dkulp
Date: Fri May  9 11:02:01 2008
New Revision: 654899

URL: http://svn.apache.org/viewvc?rev=654899&view=rev
Log:
[CXF-1581] Fix problems with ?wsdl with sun stax implemenations

Modified:

cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java

Modified: 
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=654899&r1=654898&r2=654899&view=diff
==
--- 
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java 
(original)
+++ 
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java 
Fri May  9 11:02:01 2008
@@ -516,7 +516,15 @@
 declareNamespace = false;
 }
 } else {
-writer.writeAttribute(attrPrefix, attr.getNamespaceURI(), 
name, attr.getNodeValue());
+String attns = attr.getNamespaceURI();
+String value = attr.getNodeValue();
+if (attns == null || attns.length() == 0) {
+writer.writeAttribute(name, value);
+} else if (attrPrefix == null || attrPrefix.length() == 0) 
{
+writer.writeAttribute(attns, name, value);
+} else {
+writer.writeAttribute(attrPrefix, attns, name, value);
+}
 }
 }
 }

svn commit: r654908 - /cxf/branches/2.0.x-fixes/

[dkulp]

Author: dkulp
Date: Fri May  9 11:41:17 2008
New Revision: 654908

URL: http://svn.apache.org/viewvc?rev=654908&view=rev
Log:
Blocked revisions 
651669,652100,652136,652551,652899,652938,653507,654008,654011,654064 via 
svnmerge


  r651669 | joes | 2008-04-25 13:57:57 -0400 (Fri, 25 Apr 2008) | 2 lines
  
  move cxf to tlp

  r652100 | bimargulies | 2008-04-29 16:50:47 -0400 (Tue, 29 Apr 2008) | 2 lines
  
  Fix cxf-1555 and cxf-1554.

  r652136 | dkulp | 2008-04-29 17:18:35 -0400 (Tue, 29 Apr 2008) | 2 lines
  
  Workaround issues on OSX/Windows where maven looks for the wrong class names

  r652551 | dkulp | 2008-05-01 11:14:31 -0400 (Thu, 01 May 2008) | 3 lines
  
  Make validation tests just allow exceptions to propogate up to JUnit instead 
of printStackTrace()
  Stop using NodeList in AbstractDataBinging as NodeLists are aparently not 
threadsafe in xerces.

  r652899 | dkulp | 2008-05-02 16:36:13 -0400 (Fri, 02 May 2008) | 3 lines
  
  [CXF-1556] Reduce logging level in JAXRS
  Also change protection on a method in aegis that is seeming to invoke a bug 
in the latest PMD or checkstyle plugin in eclipse.

  r652938 | bimargulies | 2008-05-02 18:50:06 -0400 (Fri, 02 May 2008) | 2 lines
  
  Remove workaround for fixed problem in XmlSchema.

  r653507 | gawor | 2008-05-05 11:40:48 -0400 (Mon, 05 May 2008) | 1 line
  
  update scm urls

  r654008 | ffang | 2008-05-07 02:50:03 -0400 (Wed, 07 May 2008) | 1 line
  
  [CXF-1573]JBIDestinationOutputStream should copy attachments into 
NormalizedMessage to support outbound attachments

  r654011 | ffang | 2008-05-07 03:09:32 -0400 (Wed, 07 May 2008) | 1 line
  
  [CXF-1573]JBIDestinationOutputStream should copy attachments into 
NormalizedMessage to support outbound attachments

  r654064 | ffang | 2008-05-07 06:21:52 -0400 (Wed, 07 May 2008) | 1 line
  
  [CXF-1574]JBI transport should support copy inbound normalizedmessage 
property to outbound normalizedmessage


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-blocked' - no diff available.

svn commit: r654910 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java

[dkulp]

Author: dkulp
Date: Fri May  9 11:43:10 2008
New Revision: 654910

URL: http://svn.apache.org/viewvc?rev=654910&view=rev
Log:
Merged revisions 654899 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r654899 | dkulp | 2008-05-09 14:02:01 -0400 (Fri, 09 May 2008) | 2 lines
  
  [CXF-1581] Fix problems with ?wsdl with sun stax implemenations


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=654910&r1=654909&r2=654910&view=diff
==
--- 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
 Fri May  9 11:43:10 2008
@@ -516,7 +516,15 @@
 declareNamespace = false;
 }
 } else {
-writer.writeAttribute(attrPrefix, attr.getNamespaceURI(), 
name, attr.getNodeValue());
+String attns = attr.getNamespaceURI();
+String value = attr.getNodeValue();
+if (attns == null || attns.length() == 0) {
+writer.writeAttribute(name, value);
+} else if (attrPrefix == null || attrPrefix.length() == 0) 
{
+writer.writeAttribute(attns, name, value);
+} else {
+writer.writeAttribute(attrPrefix, attns, name, value);
+}
 }
 }
 }

svn commit: r654919 - /cxf/trunk/distribution/bundle/pom.xml

[dkulp]

Author: dkulp
Date: Fri May  9 12:39:48 2008
New Revision: 654919

URL: http://svn.apache.org/viewvc?rev=654919&view=rev
Log:
Give javadoc more memory or it fails on OS X

Modified:
cxf/trunk/distribution/bundle/pom.xml

Modified: cxf/trunk/distribution/bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/pom.xml?rev=654919&r1=654918&r2=654919&view=diff
==
--- cxf/trunk/distribution/bundle/pom.xml (original)
+++ cxf/trunk/distribution/bundle/pom.xml Fri May  9 12:39:48 2008
@@ -411,6 +411,8 @@
 
 
 
+128m
+512m
 Apache CXF API
 Apache CXF API
 
${project.build.directory}/sources

svn commit: r654920 - in /cxf/branches/2.0.x-fixes: ./ distribution/bundle/pom.xml

[dkulp]

Author: dkulp
Date: Fri May  9 12:48:19 2008
New Revision: 654920

URL: http://svn.apache.org/viewvc?rev=654920&view=rev
Log:
Merged revisions 654919 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r654919 | dkulp | 2008-05-09 15:39:48 -0400 (Fri, 09 May 2008) | 2 lines
  
  Give javadoc more memory or it fails on OS X


Modified:
cxf/branches/2.0.x-fixes/   (props changed)
cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml?rev=654920&r1=654919&r2=654920&view=diff
==
--- cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Fri May  9 12:48:19 
2008
@@ -372,6 +372,8 @@
 
 
 
+128m
+512m
 Apache CXF API
 Apache CXF API
 
${project.build.directory}/sources

svn commit: r655562 - in /cxf/trunk/tools/validator/src: main/java/org/apache/cxf/tools/validator/internal/ main/java/org/apache/cxf/tools/validator/internal/model/ test/java/org/apache/cxf/tools/vali

[dkulp]

Author: dkulp
Date: Mon May 12 10:02:14 2008
New Revision: 655562

URL: http://svn.apache.org/viewvc?rev=655562&view=rev
Log:
Fix and issue with not being able to validate a valid wsdl that uses defaults 
for portType operation message names

Added:

cxf/trunk/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl
   (with props)
Modified:

cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java

cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java

cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java

Modified: 
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=655562&r1=655561&r2=655562&view=diff
==
--- 
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
 (original)
+++ 
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
 Mon May 12 10:02:14 2008
@@ -329,6 +329,10 @@
 XInput oNode = new XInput();
 oNode.setName(name);
 oNode.setParentNode(opVNode);
+
+if (name != null && name.equals(opVNode.getAttributeValue() + 
"Request")) {
+oNode.setDefaultAttributeValue(true);
+}
 return oNode;
 }
 
@@ -336,6 +340,9 @@
 XOutput oNode = new XOutput();
 oNode.setName(name);
 oNode.setParentNode(opVNode);
+if (name != null && name.equals(opVNode.getAttributeValue() + 
"Response")) {
+oNode.setDefaultAttributeValue(true);
+}
 return oNode;
 }
 

Modified: 
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java?rev=655562&r1=655561&r2=655562&view=diff
==
--- 
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java
 (original)
+++ 
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java
 Mon May 12 10:02:14 2008
@@ -32,6 +32,7 @@
 private QName name;
 private String attributeName;
 private String attributeValue;
+private boolean isDefaultAttributeValue;
 private XNode parentNode;
 
 private XNode failurePoint;
@@ -77,7 +78,14 @@
 public void setAttributeValue(final String newAttributeValue) {
 this.attributeValue = newAttributeValue;
 }
-
+
+public void setDefaultAttributeValue(boolean b) {
+this.isDefaultAttributeValue = b;
+}
+public boolean isDefaultAttributeValue() {
+return this.isDefaultAttributeValue;
+}
+
 public XNode getParentNode() {
 return parentNode;
 }
@@ -118,11 +126,18 @@
 sb.append(":");
 sb.append(name.getLocalPart());
 if (!StringUtils.isEmpty(attributeName) && 
!StringUtils.isEmpty(attributeValue)) {
-sb.append("[@");
+sb.append("[");
+if (isDefaultAttributeValue) {
+sb.append("not(@");
+sb.append(attributeName);
+sb.append(") or ");
+}
+sb.append("@");
 sb.append(attributeName);
 sb.append("='");
 sb.append(attributeValue);
-sb.append("']");
+sb.append("'");
+sb.append("]");
 }
 return sb.toString();
 }

Modified: 
cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?rev=655562&r1=655561&r2=655562&view=diff
==
--- 
cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
 (original)
+++ 
cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
 Mon May 12 10:02:14 2008
@@ -31,6 +31,14 @@
 public void setUp() {
 super.setUp();
 }
+
+@Test
+public void testValidateDefaultOpMessageNames() throws Exception {
+String[] args = new String[] {"-verbose",
+  
getLocation("/validator_wsdl/defaultOpMessageNam

svn commit: r655602 - in /cxf/trunk: api/src/main/java/org/apache/cxf/service/model/BindingInfo.java rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java

[dkulp]

Author: dkulp
Date: Mon May 12 12:06:32 2008
New Revision: 655602

URL: http://svn.apache.org/viewvc?rev=655602&view=rev
Log:
Fix more issues with wsdl first problems where binding operations have message 
names, but the portTypes don't (and thus should use defaults) 

Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java

cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java?rev=655602&r1=655601&r2=655602&view=diff
==
--- cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java 
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java 
Mon May 12 12:06:32 2008
@@ -64,19 +64,22 @@
 return name;
 }
 
-private boolean nameEquals(String a, String b) {
+private boolean nameEquals(String a, String b, String def) {
 if (a == null) {
 // in case of input/output itself is empty
 return true;
 } else {
+if (b == null) {
+b = def;
+}
 return "".equals(a) ? "".equals(b) : a.equals(b);
 }
 }
 public BindingOperationInfo buildOperation(QName opName, String inName, 
String outName) {
 for (OperationInfo op : getInterface().getOperations()) {
 if (opName.equals(op.getName())
-&& nameEquals(inName, op.getInputName())
-&& nameEquals(outName, op.getOutputName())) {
+&& nameEquals(inName, op.getInputName(), 
op.getName().getLocalPart() + "Request")
+&& nameEquals(outName, op.getOutputName(), 
op.getName().getLocalPart() + "Response")) {
 
 return new BindingOperationInfo(this, op);
 }

Modified: 
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java?rev=655602&r1=655601&r2=655602&view=diff
==
--- 
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
 (original)
+++ 
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
 Mon May 12 12:06:32 2008
@@ -19,7 +19,6 @@
 package org.apache.cxf.frontend;
 
 import java.lang.reflect.Method;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -46,7 +45,8 @@
 for (Method m : methods) {
 methodToOp.put(m, o);
 
-Map biToBop = new 
HashMap();
+Map biToBop 
+= new ConcurrentHashMap();
 infoMap.put(m, biToBop);
 }
 

svn commit: r655604 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/util/CacheMap.java

[dkulp]

Author: dkulp
Date: Mon May 12 12:11:18 2008
New Revision: 655604

URL: http://svn.apache.org/viewvc?rev=655604&view=rev
Log:
Merged revisions 654925 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r654925 | bimargulies | 2008-05-09 16:08:46 -0400 (Fri, 09 May 2008) | 2 lines
  
  Add more comments.


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/CacheMap.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/CacheMap.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/CacheMap.java?rev=655604&r1=655603&r2=655604&view=diff
==
--- 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/CacheMap.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/CacheMap.java
 Mon May 12 12:11:18 2008
@@ -37,7 +37,9 @@
  * may reference the data keep the data in the cache.
  *
  * 
- * Note that this implementation is not synchronized.
+ * Note that this implementation is not synchronized. Not even a little. 
+ * 'Read-only' operations can trigger internal modifications. If you share 
this 
+ * class between threads, you must protect every operation.
  * 
  */
 public class CacheMap implements Map {

svn commit: r655607 - in /cxf/branches/2.0.x-fixes: ./ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java

[dkulp]

Author: dkulp
Date: Mon May 12 12:17:07 2008
New Revision: 655607

URL: http://svn.apache.org/viewvc?rev=655607&view=rev
Log:
Merged revisions 654979 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r654979 | bimargulies | 2008-05-09 19:41:48 -0400 (Fri, 09 May 2008) | 2 lines
  
  Disable noisy test I hadn't really meant to enable.


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java?rev=655607&r1=655606&r2=655607&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
 Mon May 12 12:17:07 2008
@@ -37,6 +37,7 @@
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -69,6 +70,7 @@
 clientInterface = (MapTest)proxyFac.create(); 
 }
 
+@Ignore
 @Test
 public void testMapWsdl() throws WSDLException {
 @SuppressWarnings("unused")

svn commit: r655609 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java

[dkulp]

Author: dkulp
Date: Mon May 12 12:18:19 2008
New Revision: 655609

URL: http://svn.apache.org/viewvc?rev=655609&view=rev
Log:
Merged revisions 655560 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r655560 | bimargulies | 2008-05-12 12:57:45 -0400 (Mon, 12 May 2008) | 2 lines
  
  Fix Javadoc as per CXF-1585.


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java?rev=655609&r1=655608&r2=655609&view=diff
==
--- 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
 Mon May 12 12:18:19 2008
@@ -41,7 +41,7 @@
  * application must provide an object that extends [EMAIL PROTECTED] 
AbstractDelegatingLogger}, and advertise that class
  * via one of the following mechanisms:
  * 
- * Create a file, in the classpath, named 
META-INF/cxf/org.apache.cxf.logger. 
+ * Create a file, in the classpath, named 
META-INF/cxf/org.apache.cxf.Logger. 
  * This file should contain the fully-qualified name
  * of the class, with no comments, on a single line.
  * Call [EMAIL PROTECTED] #setLoggerClass(Class)} with a Class 
reference to the logger class.

svn commit: r655611 - in /cxf/branches/2.0.x-fixes: ./ tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/mode

[dkulp]

Author: dkulp
Date: Mon May 12 12:23:45 2008
New Revision: 655611

URL: http://svn.apache.org/viewvc?rev=655611&view=rev
Log:
Merged revisions 655562 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r655562 | dkulp | 2008-05-12 13:02:14 -0400 (Mon, 12 May 2008) | 2 lines
  
  Fix and issue with not being able to validate a valid wsdl that uses defaults 
for portType operation message names


Added:

cxf/branches/2.0.x-fixes/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl
  - copied unchanged from r655562, 
cxf/trunk/tools/validator/src/test/resources/validator_wsdl/defaultOpMessageNames.wsdl
Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java

cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java

cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=655611&r1=655610&r2=655611&view=diff
==
--- 
cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
 Mon May 12 12:23:45 2008
@@ -329,6 +329,10 @@
 XInput oNode = new XInput();
 oNode.setName(name);
 oNode.setParentNode(opVNode);
+
+if (name != null && name.equals(opVNode.getAttributeValue() + 
"Request")) {
+oNode.setDefaultAttributeValue(true);
+}
 return oNode;
 }
 
@@ -336,6 +340,9 @@
 XOutput oNode = new XOutput();
 oNode.setName(name);
 oNode.setParentNode(opVNode);
+if (name != null && name.equals(opVNode.getAttributeValue() + 
"Response")) {
+oNode.setDefaultAttributeValue(true);
+}
 return oNode;
 }
 

Modified: 
cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java?rev=655611&r1=655610&r2=655611&view=diff
==
--- 
cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java
 Mon May 12 12:23:45 2008
@@ -32,6 +32,7 @@
 private QName name;
 private String attributeName;
 private String attributeValue;
+private boolean isDefaultAttributeValue;
 private XNode parentNode;
 
 private XNode failurePoint;
@@ -77,7 +78,14 @@
 public void setAttributeValue(final String newAttributeValue) {
 this.attributeValue = newAttributeValue;
 }
-
+
+public void setDefaultAttributeValue(boolean b) {
+this.isDefaultAttributeValue = b;
+}
+public boolean isDefaultAttributeValue() {
+return this.isDefaultAttributeValue;
+}
+
 public XNode getParentNode() {
 return parentNode;
 }
@@ -118,11 +126,18 @@
 sb.append(":");
 sb.append(name.getLocalPart());
 if (!StringUtils.isEmpty(attributeName) && 
!StringUtils.isEmpty(attributeValue)) {
-sb.append("[@");
+sb.append("[");
+if (isDefaultAttributeValue) {
+sb.append("not(@");
+sb.append(attributeName);
+sb.append(") or ");
+}
+sb.append("@");
 sb.append(attributeName);
 sb.append("='");
 sb.append(attributeValue);
-sb.append("']");
+sb.append("'");
+sb.append("]");
 }
 return sb.toString();
 }

Modified: 
cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/o

svn commit: r655612 - in /cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/service/model/BindingInfo.java rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.j

[dkulp]

Author: dkulp
Date: Mon May 12 12:24:59 2008
New Revision: 655612

URL: http://svn.apache.org/viewvc?rev=655612&view=rev
Log:
Merged revisions 655602 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r655602 | dkulp | 2008-05-12 15:06:32 -0400 (Mon, 12 May 2008) | 2 lines
  
  Fix more issues with wsdl first problems where binding operations have 
message names, but the portTypes don't (and thus should use defaults) 


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java

cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java?rev=655612&r1=655611&r2=655612&view=diff
==
--- 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java
 Mon May 12 12:24:59 2008
@@ -64,19 +64,22 @@
 return name;
 }
 
-private boolean nameEquals(String a, String b) {
+private boolean nameEquals(String a, String b, String def) {
 if (a == null) {
 // in case of input/output itself is empty
 return true;
 } else {
+if (b == null) {
+b = def;
+}
 return "".equals(a) ? "".equals(b) : a.equals(b);
 }
 }
 public BindingOperationInfo buildOperation(QName opName, String inName, 
String outName) {
 for (OperationInfo op : getInterface().getOperations()) {
 if (opName.equals(op.getName())
-&& nameEquals(inName, op.getInputName())
-&& nameEquals(outName, op.getOutputName())) {
+&& nameEquals(inName, op.getInputName(), 
op.getName().getLocalPart() + "Request")
+&& nameEquals(outName, op.getOutputName(), 
op.getName().getLocalPart() + "Response")) {
 
 return new BindingOperationInfo(this, op);
 }

Modified: 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java?rev=655612&r1=655611&r2=655612&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
 Mon May 12 12:24:59 2008
@@ -19,7 +19,6 @@
 package org.apache.cxf.frontend;
 
 import java.lang.reflect.Method;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -46,7 +45,8 @@
 for (Method m : methods) {
 methodToOp.put(m, o);
 
-Map biToBop = new 
HashMap();
+Map biToBop 
+= new ConcurrentHashMap();
 infoMap.put(m, biToBop);
 }
 

svn commit: r655641 - /cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

[dkulp]

Author: dkulp
Date: Mon May 12 14:09:02 2008
New Revision: 655641

URL: http://svn.apache.org/viewvc?rev=655641&view=rev
Log:
[CXF-1583,CXF-1584] Patches for issues with the classpath and dynamic client 
applied from Alton Idowu

Modified:

cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Modified: 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=655641&r1=655640&r2=655641&view=diff
==
--- 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 (original)
+++ 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 Mon May 12 14:09:02 2008
@@ -61,7 +61,6 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.CXFBusFactory;
 import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.common.i18n.UncheckedException;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.endpoint.Client;
@@ -404,20 +403,22 @@
 URL[] urls = ((URLClassLoader)tcl).getURLs();
 for (URL url : urls) {
 if (url.getProtocol().startsWith("file")) {
-try {
-File file = new File(url.toURI().getPath());
-if (file.exists()) {
-classPath.append(file.getAbsolutePath())
-.append(System
-.getProperty("path.separator"));   
 
-}
-   
-if (file.getName().endsWith(".jar")) {
-addClasspathFromManifest(classPath, file);
-}
-} catch (URISyntaxException e) {
-throw new UncheckedException(e);
-}
+File file; 
+try { 
+file = new File(url.toURI().getPath()); 
+} catch (URISyntaxException urise) { 
+file = new File(url.getPath()); 
+} 
+
+if (file.exists()) { 
+classPath.append(file.getAbsolutePath()) 
+.append(System 
+.getProperty("path.separator")); 
+
+if (file.getName().endsWith(".jar")) { 
+addClasspathFromManifest(classPath, file); 
+} 
+} 
 }
 }
 }

svn commit: r656372 - in /cxf/trunk: rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ systests/src/test/java/org/apache/cxf/systest/http_jetty/ systests/src/test/java/org/apache

[dkulp]

Author: dkulp
Date: Wed May 14 12:16:18 2008
New Revision: 656372

URL: http://svn.apache.org/viewvc?rev=656372&view=rev
Log:
Remove the cxf.xml in systests at that's causing all the systests to use it 
which isn't exactly expected.  (moved it into the test package that requires it)
Make sure the proper content-type for soap is set.  In some cases, it was being 
clobbered at conduit setup. 

Added:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml  
 (with props)
Removed:
cxf/trunk/systests/src/test/resources/cxf.xml
Modified:

cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java

Modified: 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java?rev=656372&r1=656371&r2=656372&view=diff
==
--- 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
 (original)
+++ 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
 Wed May 14 12:16:18 2008
@@ -27,6 +27,7 @@
 import org.apache.cxf.binding.soap.SoapVersion;
 import org.apache.cxf.interceptor.AttachmentOutInterceptor;
 import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 
 import static org.apache.cxf.message.Message.MIME_HEADERS;
@@ -71,6 +72,8 @@
 soapVersion = Soap11.getInstance();
 message.setVersion(soapVersion);
 }
+
+message.put(Message.CONTENT_TYPE, soapVersion.getContentType());
 }
 
 /**

Modified: 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java?rev=656372&r1=656371&r2=656372&view=diff
==
--- 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
 (original)
+++ 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
 Wed May 14 12:16:18 2008
@@ -86,7 +86,7 @@
 
 public void setUpBus(boolean includeService) throws Exception {
 applicationContext = new GenericApplicationContext();
-readBeans(new ClassPathResource("cxf.xml"));
+readBeans(new 
ClassPathResource("/org/apache/cxf/systest/http_jetty/cxf.xml"));
 readBeans(new ClassPathResource("META-INF/cxf/cxf.xml"));
 readBeans(new 
ClassPathResource("META-INF/cxf/cxf-extension-soap.xml"));
 readBeans(new 
ClassPathResource("META-INF/cxf/cxf-extension-http.xml"));

Added: 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml?rev=656372&view=auto
==
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml 
(added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml 
Wed May 14 12:16:18 2008
@@ -0,0 +1,30 @@
+
+
+http://www.springframework.org/schema/beans";
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+   xmlns:http="http://cxf.apache.org/transports/http/configuration";
+   xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd
+http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+  
+
+  
+
+
\ No newline at end of file

Propchange: 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml
--
svn:eol-style = native

Propchange: 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml
--
svn:keywords = Rev Date

Propchange: 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml
--
svn:mime-type = text/xml

Modified: 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap/SoapA

svn commit: r656416 - /cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java

[dkulp]

Author: dkulp
Date: Wed May 14 13:29:57 2008
New Revision: 656416

URL: http://svn.apache.org/viewvc?rev=656416&view=rev
Log:
Add snippet comment back in for the confluence snippet plugin

Modified:

cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java

Modified: 
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java?rev=656416&r1=656415&r2=656416&view=diff
==
--- 
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java
 (original)
+++ 
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java
 Wed May 14 13:29:57 2008
@@ -23,6 +23,8 @@
 import javax.jws.WebService;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+// START SNIPPET: service
+
 @WebService
 public interface HelloWorld {
 

svn commit: r656484 - in /cxf/trunk/distribution/src/main/release/samples/wsdl_first_https: CherryServer.cxf WibbleClient.cxf

[dkulp]

Author: dkulp
Date: Wed May 14 18:11:09 2008
New Revision: 656484

URL: http://svn.apache.org/viewvc?rev=656484&view=rev
Log:
Fix https stuff on my mac, remove some unneeded bus lines.

Modified:

cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/CherryServer.cxf

cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/WibbleClient.cxf

Modified: 
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/CherryServer.cxf
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/CherryServer.cxf?rev=656484&r1=656483&r2=656484&view=diff
==
--- 
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/CherryServer.cxf
 (original)
+++ 
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/CherryServer.cxf
 Wed May 14 18:11:09 2008
@@ -40,7 +40,7 @@
   http://apache.org/hello_world_soap_http}GreeterPort.http-destination";> 
   
 
-  
+  

 
   
@@ -66,7 +66,4 @@
 

   
-  
-  
-  
 

Modified: 
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/WibbleClient.cxf
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/WibbleClient.cxf?rev=656484&r1=656483&r2=656484&view=diff
==
--- 
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/WibbleClient.cxf
 (original)
+++ 
cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/WibbleClient.cxf
 Wed May 14 18:11:09 2008
@@ -36,7 +36,7 @@
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
   http://apache.org/hello_world_soap_http}SoapPort.http-conduit";>
-
+
   
   
@@ -58,8 +58,5 @@
   
 

-  
-
- 
+ 
 
-

svn commit: r656729 - /cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java

[dkulp]

Author: dkulp
Date: Thu May 15 09:46:33 2008
New Revision: 656729

URL: http://svn.apache.org/viewvc?rev=656729&view=rev
Log:
Spit out a slightly more informative error message

Modified:

cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java

Modified: 
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java?rev=656729&r1=656728&r2=656729&view=diff
==
--- 
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
 (original)
+++ 
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
 Thu May 15 09:46:33 2008
@@ -198,7 +198,7 @@
 } 
 // checking the protocol
 if (!protocol.equals(ref.getProtocol())) {
-throw new IOException("Protocol mismatch: "
+throw new IOException("Protocol mismatch for port " + port + ": "
 + "engine's protocol is " + ref.getProtocol()
 + ", the url protocol is " + protocol);
 }

svn commit: r657067 - in /cxf/branches/2.0.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ systests/src/test/java/org/apache/cxf/systest/http_jetty/ systests/src/te

[dkulp]

Author: dkulp
Date: Fri May 16 07:00:29 2008
New Revision: 657067

URL: http://svn.apache.org/viewvc?rev=657067&view=rev
Log:
Merged revisions 656372 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r656372 | dkulp | 2008-05-14 15:16:18 -0400 (Wed, 14 May 2008) | 3 lines
  
  Remove the cxf.xml in systests at that's causing all the systests to use it 
which isn't exactly expected.  (moved it into the test package that requires it)
  Make sure the proper content-type for soap is set.  In some cases, it was 
being clobbered at conduit setup. 


Added:

cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml
  - copied unchanged from r656372, 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/cxf.xml
Removed:
cxf/branches/2.0.x-fixes/systests/src/test/resources/cxf.xml
Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java

cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java

cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java?rev=657067&r1=657066&r2=657067&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
 Fri May 16 07:00:29 2008
@@ -27,6 +27,7 @@
 import org.apache.cxf.binding.soap.SoapVersion;
 import org.apache.cxf.interceptor.AttachmentOutInterceptor;
 import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 
 import static org.apache.cxf.message.Message.MIME_HEADERS;
@@ -71,6 +72,8 @@
 soapVersion = Soap11.getInstance();
 message.setVersion(soapVersion);
 }
+
+message.put(Message.CONTENT_TYPE, soapVersion.getContentType());
 }
 
 /**

Modified: 
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java?rev=657067&r1=657066&r2=657067&view=diff
==
--- 
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
 Fri May 16 07:00:29 2008
@@ -86,7 +86,7 @@
 
 public void setUpBus(boolean includeService) throws Exception {
 applicationContext = new GenericApplicationContext();
-readBeans(new ClassPathResource("cxf.xml"));
+readBeans(new 
ClassPathResource("/org/apache/cxf/systest/http_jetty/cxf.xml"));
 readBeans(new ClassPathResource("META-INF/cxf/cxf.xml"));
 readBeans(new 
ClassPathResource("META-INF/cxf/cxf-extension-soap.xml"));
 readBeans(new 
ClassPathResource("META-INF/cxf/cxf-extension-http.xml"));

Modified: 
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java?rev=657067&r1=657066&r2=657067&view=diff
==
--- 
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java
 Fri May 16 07:00:29 2008
@@ -19,54 +19,70 @@
 
 package org.apache.cxf.systest.soap;
 
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.soap.Soap12;
 import org.apache.cxf.binding.soap.SoapBindingConfiguration;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-import org.apache.cxf.test.AbstractCXFTe

svn commit: r657068 - in /cxf/branches/2.0.x-fixes: ./ distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java

[dkulp]

Author: dkulp
Date: Fri May 16 07:02:22 2008
New Revision: 657068

URL: http://svn.apache.org/viewvc?rev=657068&view=rev
Log:
Merged revisions 656416 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r656416 | dkulp | 2008-05-14 16:29:57 -0400 (Wed, 14 May 2008) | 2 lines
  
  Add snippet comment back in for the confluence snippet plugin


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java?rev=657068&r1=657067&r2=657068&view=diff
==
--- 
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/demo/hw/server/HelloWorld.java
 Fri May 16 07:02:22 2008
@@ -21,6 +21,8 @@
 
 import javax.jws.WebService;
 
+// START SNIPPET: service
+
 @WebService
 public interface HelloWorld {
 String sayHi(String text);

svn commit: r657074 - in /cxf/branches/2.0.x-fixes: ./ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java

[dkulp]

Author: dkulp
Date: Fri May 16 07:16:31 2008
New Revision: 657074

URL: http://svn.apache.org/viewvc?rev=657074&view=rev
Log:
Merged revisions 656729 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r656729 | dkulp | 2008-05-15 12:46:33 -0400 (Thu, 15 May 2008) | 2 lines
  
  Spit out a slightly more informative error message


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java?rev=657074&r1=657073&r2=657074&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
 Fri May 16 07:16:31 2008
@@ -198,7 +198,7 @@
 } 
 // checking the protocol
 if (!protocol.equals(ref.getProtocol())) {
-throw new IOException("Protocol mismatch: "
+throw new IOException("Protocol mismatch for port " + port + ": "
 + "engine's protocol is " + ref.getProtocol()
 + ", the url protocol is " + protocol);
 }

svn commit: r657892 - in /cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin: WSDL2JavaMojo.java WsdlOption.java

[dkulp]

Author: dkulp
Date: Mon May 19 11:00:46 2008
New Revision: 657892

URL: http://svn.apache.org/viewvc?rev=657892&view=rev
Log:
[CXF-1593] Fix problems of wsdlOptions configured in the pom not being used for 
wsdl's in the src/main/resources/wsdl directory.
Also, move the .DONE files out of the generated directory so they aren't package

Modified:

cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java

cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java

Modified: 
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?rev=657892&r1=657891&r2=657892&view=diff
==
--- 
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
 (original)
+++ 
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
 Mon May 19 11:00:46 2008
@@ -84,6 +84,13 @@
  * @parameter expression="${cxf.testWsdlRoot}" 
default-value="${basedir}/src/test/resources/wsdl"
  */
 File testWsdlRoot;
+
+/**
+ * Directory in which the "DONE" markers are saved that 
+ * @parameter expression="${cxf.markerDirectory}" 
+ *
default-value="${project.build.directory}/cxf-codegen-plugin-markers"
+ */
+File markerDirectory;
 
 /**
  * Use the compile classpath rather than the test classpath for execution
@@ -119,15 +126,16 @@
 }
 return options;
 }
-
+
 public void execute() throws MojoExecutionException {
 if (includes == null) {
 includes = new String[] {"*.wsdl"};
-}
-
+} 
+   
 File classesDir = new File(classesDirectory);
 classesDir.mkdirs();
-
+markerDirectory.mkdirs();
+
 List options = new ArrayList();
 if (wsdlRoot != null && wsdlRoot.exists()) {
 options.addAll(getWsdlOptionsFromDir(wsdlRoot, sourceRoot));
@@ -142,6 +150,19 @@
 if (o.getOutputDir() == null) {
 o.setOutputDir(outputDirFile);
 }
+
+File file = new File(project.getBasedir(), o.getWsdl());   
 
+if (file.exists()) {
+for (WsdlOption o2 : options) {
+File file2 = new File(o2.getWsdl());
+if (file2.exists() 
+&& file2.equals(file)) {
+o.getExtraargs().addAll(0, o2.getExtraargs());
+options.remove(o2);
+break;
+}
+}
+}
 options.add(o);
 }
 }
@@ -244,7 +265,7 @@
 File file = new File(wsdlOption.getWsdl());
 // If URL to WSDL, replace ? and & since they're invalid chars for 
file names
 File doneFile =
-new File(outputDirFile, "." + file.getName().replace('?', 
'_').replace('&', '_') + ".DONE");
+new File(markerDirectory, "." + file.getName().replace('?', 
'_').replace('&', '_') + ".DONE");
 boolean doWork = cgtimestamp > doneFile.lastModified();
 if (!doneFile.exists()) {
 doWork = true;
@@ -287,7 +308,7 @@
 }
 list.add(wsdlOption.getWsdl());
 
-
+getLog().debug("Calling wsdl2java with args: " + list);
 try {
 new WSDLToJava((String[])list.toArray(new 
String[list.size()])).run(new ToolContext());
 doneFile.createNewFile();

Modified: 
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java?rev=657892&r1=657891&r2=657892&view=diff
==
--- 
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
 (original)
+++ 
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
 Mon May 19 11:00:46 2008
@@ -89,4 +89,14 @@
 WsdlOption t = (WsdlOption) obj;
 return t.getWsdl().equals(getWsdl());
 }
+
+public String toString() {
+StringBuilder builder = new StringBuilder();
+builder.append("WSDL: ")

svn commit: r657920 - in /cxf/branches/2.0.x-fixes: ./ maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java maven-plugins/codegen-plugin/src/main/java/org/apache/c

[dkulp]

Author: dkulp
Date: Mon May 19 11:59:20 2008
New Revision: 657920

URL: http://svn.apache.org/viewvc?rev=657920&view=rev
Log:
Merged revisions 657892 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r657892 | dkulp | 2008-05-19 14:00:46 -0400 (Mon, 19 May 2008) | 3 lines
  
  [CXF-1593] Fix problems of wsdlOptions configured in the pom not being used 
for wsdl's in the src/main/resources/wsdl directory.
  Also, move the .DONE files out of the generated directory so they aren't 
package


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java

cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?rev=657920&r1=657919&r2=657920&view=diff
==
--- 
cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
 Mon May 19 11:59:20 2008
@@ -84,6 +84,13 @@
  * @parameter expression="${cxf.testWsdlRoot}"
  */
 File testWsdlRoot;
+
+/**
+ * Directory in which the "DONE" markers are saved that 
+ * @parameter expression="${cxf.markerDirectory}" 
+ *
default-value="${project.build.directory}/cxf-codegen-plugin-markers"
+ */
+File markerDirectory;
 
 /**
  * Use the compile classpath rather than the test classpath for execution
@@ -119,15 +126,16 @@
 }
 return options;
 }
-
+
 public void execute() throws MojoExecutionException {
 if (includes == null) {
 includes = new String[] {"*.wsdl"};
-}
-
+} 
+   
 File classesDir = new File(classesDirectory);
 classesDir.mkdirs();
-
+markerDirectory.mkdirs();
+
 List options = new ArrayList();
 if (wsdlRoot != null && wsdlRoot.exists()) {
 options.addAll(getWsdlOptionsFromDir(wsdlRoot, sourceRoot));
@@ -142,6 +150,19 @@
 if (o.getOutputDir() == null) {
 o.setOutputDir(outputDirFile);
 }
+
+File file = new File(project.getBasedir(), o.getWsdl());   
 
+if (file.exists()) {
+for (WsdlOption o2 : options) {
+File file2 = new File(o2.getWsdl());
+if (file2.exists() 
+&& file2.equals(file)) {
+o.getExtraargs().addAll(0, o2.getExtraargs());
+options.remove(o2);
+break;
+}
+}
+}
 options.add(o);
 }
 }
@@ -244,7 +265,7 @@
 File file = new File(wsdlOption.getWsdl());
 // If URL to WSDL, replace ? and & since they're invalid chars for 
file names
 File doneFile =
-new File(outputDirFile, "." + file.getName().replace('?', 
'_').replace('&', '_') + ".DONE");
+new File(markerDirectory, "." + file.getName().replace('?', 
'_').replace('&', '_') + ".DONE");
 boolean doWork = cgtimestamp > doneFile.lastModified();
 if (!doneFile.exists()) {
 doWork = true;
@@ -287,7 +308,7 @@
 }
 list.add(wsdlOption.getWsdl());
 
-
+getLog().debug("Calling wsdl2java with args: " + list);
 try {
 new WSDLToJava((String[])list.toArray(new 
String[list.size()])).run(new ToolContext());
 doneFile.createNewFile();

Modified: 
cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java?rev=657920&r1=657919&r2=657920&view=diff
==
--- 
cxf/branche

svn commit: r657922 - /cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java

[dkulp]

Author: dkulp
Date: Mon May 19 12:08:11 2008
New Revision: 657922

URL: http://svn.apache.org/viewvc?rev=657922&view=rev
Log:
Add a guard NPE check

Modified:

cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java

Modified: 
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=657922&r1=657921&r2=657922&view=diff
==
--- 
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 (original)
+++ 
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 Mon May 19 12:08:11 2008
@@ -362,10 +362,12 @@
 Mapping mapping = rawJaxbModelGenCode.get(wrapperElement);
 if (mapping != null) {
 List propList = 
mapping.getWrapperStyleDrilldown();
-for (Property pro : propList) {
-if 
(pro.elementName().getNamespaceURI().equals(item.getNamespaceURI())
-&& 
pro.elementName().getLocalPart().equals(item.getLocalPart())) {
-return pro.type().fullName();
+if (propList != null) {
+for (Property pro : propList) {
+if 
(pro.elementName().getNamespaceURI().equals(item.getNamespaceURI())
+&& 
pro.elementName().getLocalPart().equals(item.getLocalPart())) {
+return pro.type().fullName();
+}
 }
 }
 }

svn commit: r657928 - in /cxf/branches/2.0.x-fixes: ./ tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java

[dkulp]

Author: dkulp
Date: Mon May 19 12:25:00 2008
New Revision: 657928

URL: http://svn.apache.org/viewvc?rev=657928&view=rev
Log:
Merged revisions 657922 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r657922 | dkulp | 2008-05-19 15:08:11 -0400 (Mon, 19 May 2008) | 2 lines
  
  Add a guard NPE check


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=657928&r1=657927&r2=657928&view=diff
==
--- 
cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 Mon May 19 12:25:00 2008
@@ -337,10 +337,12 @@
 Mapping mapping = rawJaxbModelGenCode.get(wrapperElement);
 if (mapping != null) {
 List propList = 
mapping.getWrapperStyleDrilldown();
-for (Property pro : propList) {
-if 
(pro.elementName().getNamespaceURI().equals(item.getNamespaceURI())
-&& 
pro.elementName().getLocalPart().equals(item.getLocalPart())) {
-return pro.type().fullName();
+if (propList != null) {
+for (Property pro : propList) {
+if 
(pro.elementName().getNamespaceURI().equals(item.getNamespaceURI())
+&& 
pro.elementName().getLocalPart().equals(item.getLocalPart())) {
+return pro.type().fullName();
+}
 }
 }
 }

svn commit: r657978 - in /cxf/trunk: rt/core/src/main/java/org/apache/cxf/transport/ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ systests/src/test/java/org/apache/cxf/s

[dkulp]

Author: dkulp
Date: Mon May 19 14:07:54 2008
New Revision: 657978

URL: http://svn.apache.org/viewvc?rev=657978&view=rev
Log:
[CXF-1589] Fix problems of calling Endpoint.publish with a busy port not always 
throwing an exception back

Modified:

cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java

cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java

cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java

Modified: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java?rev=657978&r1=657977&r2=657978&view=diff
==
--- 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
 (original)
+++ 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
 Mon May 19 14:07:54 2008
@@ -44,7 +44,12 @@
 if (observer != null) {
 getLogger().fine("registering incoming observer: " + observer);
 if (old == null) {
-activate();
+try {
+activate();
+} catch (RuntimeException ex) {
+incomingObserver = null;
+throw ex;
+}
 }
 } else {
 if (old != null) {

Modified: 
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=657978&r1=657977&r2=657978&view=diff
==
--- 
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
 (original)
+++ 
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
 Mon May 19 14:07:54 2008
@@ -309,6 +309,7 @@
 } catch (Exception ex) {
 //ignore - probably wasn't fully started anyway
 }
+server = null;
 throw new Fault(new Message("START_UP_SERVER_FAILED_MSG", LOG, 
e.getMessage()), e);
 }
 }

Modified: 
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java?rev=657978&r1=657977&r2=657978&view=diff
==
--- 
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java
 (original)
+++ 
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java
 Mon May 19 14:07:54 2008
@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -39,7 +39,7 @@
 implements DestinationFactory {
 
 private Map destinations = 
-new HashMap();
+new ConcurrentHashMap();
 
 public JettyHTTPTransportFactory() {
 super();
@@ -98,7 +98,7 @@
 throws IOException {
 
 String addr = endpointInfo.getAddress();
-JettyHTTPDestination destination = destinations.get(addr);
+JettyHTTPDestination destination = addr == null ? null : 
destinations.get(addr);
 if (destination == null) {
 destination = createDestination(endpointInfo);
 }
@@ -110,8 +110,8 @@
 EndpointInfo endpointInfo
 ) throws IOException {
 
-JettyHTTPDestination destination = 
-destinations.get(endpointInfo.getAddress());
+String addr = endpointInfo.getAddress();
+JettyHTTPDestination destination = addr == null ? null : 
destinations.get(addr);
 if (destination == null) {
 destination = 
 new JettyHTTPDestination(getBus(), this, endpointInfo);

Modified: 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http

svn commit: r657982 - in /cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/transport/ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ systests/src/test/jav

[dkulp]

Author: dkulp
Date: Mon May 19 14:13:09 2008
New Revision: 657982

URL: http://svn.apache.org/viewvc?rev=657982&view=rev
Log:
Merged revisions 657978 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r657978 | dkulp | 2008-05-19 17:07:54 -0400 (Mon, 19 May 2008) | 2 lines
  
  [CXF-1589] Fix problems of calling Endpoint.publish with a busy port not 
always throwing an exception back


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java

cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java

cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java

cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java?rev=657982&r1=657981&r2=657982&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
 Mon May 19 14:13:09 2008
@@ -44,7 +44,12 @@
 if (observer != null) {
 getLogger().fine("registering incoming observer: " + observer);
 if (old == null) {
-activate();
+try {
+activate();
+} catch (RuntimeException ex) {
+incomingObserver = null;
+throw ex;
+}
 }
 } else {
 if (old != null) {

Modified: 
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=657982&r1=657981&r2=657982&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
 Mon May 19 14:13:09 2008
@@ -309,6 +309,7 @@
 } catch (Exception ex) {
 //ignore - probably wasn't fully started anyway
 }
+server = null;
 throw new Fault(new Message("START_UP_SERVER_FAILED_MSG", LOG, 
e.getMessage()), e);
 }
 }

Modified: 
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java?rev=657982&r1=657981&r2=657982&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java
 Mon May 19 14:13:09 2008
@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -39,7 +39,7 @@
 implements DestinationFactory {
 
 private Map destinations = 
-new HashMap();
+new ConcurrentHashMap();
 
 public JettyHTTPTransportFactory() {
 super();
@@ -98,7 +98,7 @@
 throws IOException {
 
 String addr = endpointInfo.getAddress();
-JettyHTTPDestination destination = destinations.get(addr);
+JettyHTTPDestination destination = addr == null ? null : 
destinations.get(addr);
 if (destination == null) {
 destination = createDestination(endpointInfo);
 }
@@ -1

svn commit: r658241 - /cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java

[dkulp]

Author: dkulp
Date: Tue May 20 06:31:49 2008
New Revision: 658241

URL: http://svn.apache.org/viewvc?rev=658241&view=rev
Log:
Guard against NPE when creating a fault

Modified:

cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java

Modified: 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=658241&r1=658240&r2=658241&view=diff
==
--- 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
 (original)
+++ 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
 Tue May 20 06:31:49 2008
@@ -639,8 +639,13 @@
 } catch (Throwable ex) {
 if (ex instanceof javax.xml.bind.UnmarshalException) {
 javax.xml.bind.UnmarshalException unmarshalEx = 
(javax.xml.bind.UnmarshalException)ex;
-throw new Fault(new Message("UNMARSHAL_ERROR", BUNDLE, 
unmarshalEx.getLinkedException()
-.getMessage()), ex);
+if (unmarshalEx.getLinkedException() != null) {
+throw new Fault(new Message("UNMARSHAL_ERROR", BUNDLE, 
+
unmarshalEx.getLinkedException().getMessage()), ex);
+} else {
+throw new Fault(new Message("UNMARSHAL_ERROR", BUNDLE, 
+unmarshalEx.getMessage()), 
ex);
+}
 } else {
 throw new Fault(new Message("UNMARSHAL_ERROR", BUNDLE, 
ex.getMessage()), ex);
 }

svn commit: r658299 - /cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

[dkulp]

Author: dkulp
Date: Tue May 20 08:53:45 2008
New Revision: 658299

URL: http://svn.apache.org/viewvc?rev=658299&view=rev
Log:
[CXF-1568] Possible fix for the strikeiron implicit headers problems

Modified:

cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Modified: 
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=658299&r1=658298&r2=658299&view=diff
==
--- 
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 (original)
+++ 
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 Tue May 20 08:53:45 2008
@@ -672,6 +672,7 @@
 if (paraAnnos != null && part != null) {
 part.setProperty(PARAM_ANNOTATION, paraAnnos);
 }
+
 return true;
 }
 private void setFaultClassInfo(OperationInfo o, Method selected) {
@@ -1491,6 +1492,36 @@
 part.setProperty(RAW_CLASS, rawClass);
 }
 part.setTypeClass(rawClass);
+
+if (part.getMessageInfo().getOperation().isUnwrapped()
+&& Boolean.TRUE.equals(part.getProperty(HEADER))) {
+//header from the unwrapped operation, make sure the type is set 
for the 
+//approriate header in the wrapped operation
+OperationInfo o = 
((UnwrappedOperationInfo)part.getMessageInfo().getOperation())
+.getWrappedOperation();
+
+if 
(Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.MODE_OUT))
+|| 
Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.MODE_INOUT))) 
{
+MessagePartInfo mpi = 
o.getOutput().getMessagePart(part.getName());
+if (mpi != null) {
+mpi.setTypeClass(rawClass);
+mpi.setProperty(GENERIC_TYPE, type);
+if (Collection.class.isAssignableFrom(rawClass)) {
+mpi.setProperty(RAW_CLASS, type);
+}
+}
+}
+if 
(!Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.MODE_OUT))) 
{
+MessagePartInfo mpi = 
o.getInput().getMessagePart(part.getName());
+if (mpi != null) {
+mpi.setTypeClass(rawClass);
+mpi.setProperty(GENERIC_TYPE, type);
+if (Collection.class.isAssignableFrom(rawClass)) {
+mpi.setProperty(RAW_CLASS, type);
+}
+}
+}
+}  
 }
 
 

svn commit: r658323 - /cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

[dkulp]

Author: dkulp
Date: Tue May 20 09:37:18 2008
New Revision: 658323

URL: http://svn.apache.org/viewvc?rev=658323&view=rev
Log:
[CXF-1596] Add another NPE guard

Modified:

cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Modified: 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=658323&r1=658322&r2=658323&view=diff
==
--- 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 (original)
+++ 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 Tue May 20 09:37:18 2008
@@ -401,6 +401,9 @@
 do {
 if (tcl instanceof URLClassLoader) {
 URL[] urls = ((URLClassLoader)tcl).getURLs();
+if (urls == null) {
+urls = new URL[0];
+}
 for (URL url : urls) {
 if (url.getProtocol().startsWith("file")) {
 File file; 

svn commit: r658386 - in /cxf/trunk/tools/wsdlto: databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/p

[dkulp]

Author: dkulp
Date: Tue May 20 11:41:36 2008
New Revision: 658386

URL: http://svn.apache.org/viewvc?rev=658386&view=rev
Log:
Fix some tooling to map ws-addressing elements to the appropriate EPR if we can.

Modified:

cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java

cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/W3CEPRJaxbBinding.xml

cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java

cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java

cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/OutOfBandHeaderBug.wsdl

Modified: 
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=658386&r1=658385&r2=658386&view=diff
==
--- 
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 (original)
+++ 
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 Tue May 20 11:41:36 2008
@@ -93,6 +93,7 @@
 private S2JJAXBModel rawJaxbModelGenCode;
 private ToolContext context;
 private DefaultValueProvider defaultValues;
+private boolean initialized;
 
 static {
 DEFAULT_TYPE_MAP.add("boolean");
@@ -123,10 +124,8 @@
 }
 
 
-@SuppressWarnings("unchecked")
 public void initialize(ToolContext c) throws ToolException {
 this.context = c;
-
 
 SchemaCompilerImpl schemaCompiler = 
(SchemaCompilerImpl)XJC.createSchemaCompiler();
 ClassCollector classCollector = context.get(ClassCollector.class);
@@ -138,10 +137,9 @@
 schemaCompiler.setErrorListener(listener);
 // Collection schemas = serviceInfo.getSchemas();
 List jaxbBindings = context.getJaxbBindingFile();
-Map schemaLists = (Map)context.get(ToolConstants.SCHEMA_MAP);
+Map schemaLists = CastUtils.cast((Map)context.get(ToolConstants.SCHEMA_MAP));
 
-Set keys = schemaLists.keySet();
-for (String key : keys) {
+for (String key : schemaLists.keySet()) {
 Element ele = schemaLists.get(key);
 this.removeImportElement(ele);
 String tns = ele.getAttribute("targetNamespace");
@@ -160,8 +158,7 @@
 }
 

-Map nsPkgMap = context.getNamespacePackageMap();
-for (String ns : nsPkgMap.keySet()) {
+for (String ns : context.getNamespacePackageMap().keySet()) {
 File file = JAXBUtils.getPackageMappingSchemaBindingFile(ns, 
context.mapPackageName(ns));
 try {
 InputSource ins = new InputSource(file.toURI().toString());
@@ -244,6 +241,7 @@
 }
 }
 }
+initialized = true;
 }
 
 private String getPluginUsageString(Options opts) {
@@ -305,7 +303,9 @@
 }
 
 public void generate(ToolContext c) throws ToolException {
-initialize(c);
+if (!initialized) {
+initialize(c);
+}
 if (rawJaxbModelGenCode == null) {
 return;
 }

Modified: 
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/W3CEPRJaxbBinding.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/W3CEPRJaxbBinding.xml?rev=658386&r1=658385&r2=658386&view=diff
==
--- 
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/W3CEPRJaxbBinding.xml
 (original)
+++ 
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/W3CEPRJaxbBinding.xml
 Tue May 20 11:41:36 2008
@@ -23,6 +23,15 @@



+   
+   
+   
+   
+   
+   
+   
+   
+   




Modified: 
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/P

svn commit: r658397 - /cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

[dkulp]

Author: dkulp
Date: Tue May 20 12:03:32 2008
New Revision: 658397

URL: http://svn.apache.org/viewvc?rev=658397&view=rev
Log:
[CXF-1204] Patch from Benjamin Coiffe applied.  Thanks!


Modified:

cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Modified: 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=658397&r1=658396&r2=658397&view=diff
==
--- 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 (original)
+++ 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 Tue May 20 12:03:32 2008
@@ -175,9 +175,7 @@
 
 for (Iterator packages = codeModel.packages(); 
packages.hasNext();) {
 JPackage jpackage = packages.next();
-String name = jpackage.name();
-if ("org.w3._2001.xmlschema".equals(name)
-|| !jpackage.classes().hasNext()) {
+if (!isValidPackage(jpackage)) {
 continue;
 }
 if (firstnt) {
@@ -262,6 +260,27 @@
 return client;
 }
 
+private boolean isValidPackage(JPackage jpackage) {
+if (jpackage == null) {
+return false;
+}
+String name = jpackage.name();
+if ("org.w3._2001.xmlschema".equals(name)
+|| "java.lang".equals(name)
+|| "java.io".equals(name)
+|| "generated".equals(name)) {
+return false;
+}
+Iterator i = jpackage.classes();
+while (i.hasNext()) {
+JDefinedClass current = i.next();
+if ("ObjectFactory".equals(current.name())) { 
+return true;
+}
+}
+return false;
+}
+
 private void outputDebug(JCodeModel codeModel) {
 if (!LOG.isLoggable(Level.INFO)) {
 return;

svn commit: r658401 - /cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java

[dkulp]

Author: dkulp
Date: Tue May 20 12:36:49 2008
New Revision: 658401

URL: http://svn.apache.org/viewvc?rev=658401&view=rev
Log:
[CXF-1597] Patch from hwavelet applied.  Thanks!

Modified:

cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java

Modified: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?rev=658401&r1=658400&r2=658401&view=diff
==
--- 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
 (original)
+++ 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
 Tue May 20 12:36:49 2008
@@ -195,7 +195,7 @@
 private void setStackTrace(Fault fault, Message msg) {
 Map ns = new HashMap();
 XPathUtils xu = new XPathUtils(ns);
-String ss = (String) xu.getValue("//" + Fault.STACKTRACE + "/text()", 
fault.getDetail(),
+String ss = (String) xu.getValue("/" + Fault.STACKTRACE + "/text()", 
fault.getDetail(),
 XPathConstants.STRING);
 List stackTraceList = new 
ArrayList();
 if (!StringUtils.isEmpty(ss)) {

svn commit: r658433 - in /cxf/trunk: rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ rt/frontend/jaxws/src/test/java/org/apache/cxf/

[dkulp]

Author: dkulp
Date: Tue May 20 14:08:04 2008
New Revision: 658433

URL: http://svn.apache.org/viewvc?rev=658433&view=rev
Log:
[CXF-1575, CXF-1592] Don't map webServiceException into the wsdl.  In some 
cases, allow an older saaj implementation.

Modified:

cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java

cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java

cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java

cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=658433&r1=658432&r2=658433&view=diff
==
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
 Tue May 20 14:08:04 2008
@@ -31,6 +31,7 @@
 import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPFault;
 import javax.xml.ws.AsyncHandler;
 import javax.xml.ws.Binding;
@@ -190,31 +191,11 @@
 exception.initCause(ex);
 throw exception;
 } else if (getBinding() instanceof SOAPBinding) {
-SOAPFault soapFault = 
((SOAPBinding)getBinding()).getSOAPFactory().createFault();
+SOAPFault soapFault = createSoapFault(ex);
+if (soapFault == null) {
+throw new WebServiceException(ex);
+}
 
-if (ex instanceof SoapFault) {
-soapFault.setFaultString(((SoapFault)ex).getReason());
-soapFault.setFaultCode(((SoapFault)ex).getFaultCode());
-soapFault.setFaultActor(((SoapFault)ex).getRole());
-
-Node nd = 
soapFault.getOwnerDocument().importNode(((SoapFault)ex).getOrCreateDetail(),
-  true);
-nd = nd.getFirstChild();
-soapFault.addDetail();
-while (nd != null) {
-Node next = nd.getNextSibling();
-soapFault.getDetail().appendChild(nd);
-nd = next;
-}
- 
-} else {
-soapFault.setFaultCode(new 
QName("http://cxf.apache.org/faultcode";, "HandlerFault"));
-String msg = ex.getMessage();
-if (msg != null) {
-soapFault.setFaultString(msg);
-}
-}  
-  
 SOAPFaultException  exception = new 
SOAPFaultException(soapFault);
 exception.initCause(ex);
 throw exception;
@@ -241,6 +222,47 @@
 
 }
 
+private SOAPFault createSoapFault(Exception ex) throws SOAPException {
+SOAPFault soapFault;
+try {
+soapFault = 
((SOAPBinding)getBinding()).getSOAPFactory().createFault();
+} catch (Throwable t) {
+//probably an old version of saaj or something that is not 
allowing createFault 
+//method to work.  Try the saaj 1.2 method of doing this.
+try {
+soapFault = 
((SOAPBinding)getBinding()).getMessageFactory().createMessage()
+.getSOAPBody().addFault();
+} catch (Throwable t2) {
+//still didn't work, we'll just throw what we have
+return null;
+}
+}
+
+if (ex instanceof SoapFault) {
+soapFault.setFaultString(((SoapFault)ex).getReason());
+soapFault.setFaultCode(((SoapFault)ex).getFaultCode());
+soapFault.setFaultActor(((SoapFault)ex).getRole());
+
+Node nd = 
soapFault.getOwnerDocument().importNode(((SoapFault)ex).getOrCreateDetail(),
+  true);
+nd = nd.getFirstChild();
+soapFault.addDetail();
+while (nd != null) {
+Node next = nd.getNextSibling();
+soapFault.getDetail().appendChild(nd);
+nd = next;
+}
+
+} else {
+soapFault.setFaultCode(new 
QName("http://cxf.apache.org/faultcode";, "HandlerFault"));

svn commit: r658437 - in /cxf/branches/2.0.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java

[dkulp]

Author: dkulp
Date: Tue May 20 14:13:22 2008
New Revision: 658437

URL: http://svn.apache.org/viewvc?rev=658437&view=rev
Log:
Merged revisions 658241 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r658241 | dkulp | 2008-05-20 09:31:49 -0400 (Tue, 20 May 2008) | 2 lines
  
  Guard against NPE when creating a fault


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=658437&r1=658436&r2=658437&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
 Tue May 20 14:13:22 2008
@@ -589,8 +589,13 @@
 } catch (Throwable ex) {
 if (ex instanceof javax.xml.bind.UnmarshalException) {
 javax.xml.bind.UnmarshalException unmarshalEx = 
(javax.xml.bind.UnmarshalException)ex;
-throw new Fault(new Message("UNMARSHAL_ERROR", 
-BUNDLE, 
unmarshalEx.getLinkedException().getMessage()), ex); 
+if (unmarshalEx.getLinkedException() != null) {
+throw new Fault(new Message("UNMARSHAL_ERROR", BUNDLE, 
+
unmarshalEx.getLinkedException().getMessage()), ex);
+} else {
+throw new Fault(new Message("UNMARSHAL_ERROR", BUNDLE, 
+unmarshalEx.getMessage()), 
ex);
+}
 } else {
 throw new Fault(new Message("UNMARSHAL_ERROR", BUNDLE, 
ex.getMessage()), ex);
 }

svn commit: r658438 - in /cxf/branches/2.0.x-fixes: ./ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

[dkulp]

Author: dkulp
Date: Tue May 20 14:14:18 2008
New Revision: 658438

URL: http://svn.apache.org/viewvc?rev=658438&view=rev
Log:
Merged revisions 658299 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r658299 | dkulp | 2008-05-20 11:53:45 -0400 (Tue, 20 May 2008) | 2 lines
  
  [CXF-1568] Possible fix for the strikeiron implicit headers problems


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=658438&r1=658437&r2=658438&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 Tue May 20 14:14:18 2008
@@ -634,6 +634,7 @@
 initializeParameter(part, paramType, genericType);
 part.setIndex(i + 1);
 }
+
 return true;
 }
 private void setFaultClassInfo(OperationInfo o, Method selected) {
@@ -1373,6 +1374,36 @@
 
 part.setProperty(GENERIC_TYPE, type);
 part.setTypeClass(rawClass);
+
+if (part.getMessageInfo().getOperation().isUnwrapped()
+&& Boolean.TRUE.equals(part.getProperty(HEADER))) {
+//header from the unwrapped operation, make sure the type is set 
for the 
+//approriate header in the wrapped operation
+OperationInfo o = 
((UnwrappedOperationInfo)part.getMessageInfo().getOperation())
+.getWrappedOperation();
+
+if 
(Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.MODE_OUT))
+|| 
Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.MODE_INOUT))) 
{
+MessagePartInfo mpi = 
o.getOutput().getMessagePart(part.getName());
+if (mpi != null) {
+mpi.setTypeClass(rawClass);
+mpi.setProperty(GENERIC_TYPE, type);
+if (Collection.class.isAssignableFrom(rawClass)) {
+mpi.setProperty(RAW_CLASS, type);
+}
+}
+}
+if 
(!Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.MODE_OUT))) 
{
+MessagePartInfo mpi = 
o.getInput().getMessagePart(part.getName());
+if (mpi != null) {
+mpi.setTypeClass(rawClass);
+mpi.setProperty(GENERIC_TYPE, type);
+if (Collection.class.isAssignableFrom(rawClass)) {
+mpi.setProperty(RAW_CLASS, type);
+}
+}
+}
+}  
 }
 
 

svn commit: r658439 - in /cxf/branches/2.0.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

[dkulp]

Author: dkulp
Date: Tue May 20 14:15:36 2008
New Revision: 658439

URL: http://svn.apache.org/viewvc?rev=658439&view=rev
Log:
Merged revisions 658323 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r658323 | dkulp | 2008-05-20 12:37:18 -0400 (Tue, 20 May 2008) | 2 lines
  
  [CXF-1596] Add another NPE guard


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=658439&r1=658438&r2=658439&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 Tue May 20 14:15:36 2008
@@ -367,6 +367,9 @@
 do {
 if (tcl instanceof URLClassLoader) {
 URL[] urls = ((URLClassLoader)tcl).getURLs();
+if (urls == null) {
+urls = new URL[0];
+}
 for (URL url : urls) {
 if (url.getProtocol().startsWith("file")) {
 try {

svn commit: r658440 - in /cxf/branches/2.0.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

[dkulp]

Author: dkulp
Date: Tue May 20 14:17:15 2008
New Revision: 658440

URL: http://svn.apache.org/viewvc?rev=658440&view=rev
Log:
Merged revisions 658397 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r658397 | dkulp | 2008-05-20 15:03:32 -0400 (Tue, 20 May 2008) | 3 lines
  
  [CXF-1204] Patch from Benjamin Coiffe applied.  Thanks!


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=658440&r1=658439&r2=658440&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 Tue May 20 14:17:15 2008
@@ -176,9 +176,7 @@
 
 for (Iterator packages = codeModel.packages(); 
packages.hasNext();) {
 JPackage jpackage = packages.next();
-String name = jpackage.name();
-if ("org.w3._2001.xmlschema".equals(name)
-|| !jpackage.classes().hasNext()) {
+if (!isValidPackage(jpackage)) {
 continue;
 }
 if (firstnt) {
@@ -264,6 +262,27 @@
 return client;
 }
 
+private boolean isValidPackage(JPackage jpackage) {
+if (jpackage == null) {
+return false;
+}
+String name = jpackage.name();
+if ("org.w3._2001.xmlschema".equals(name)
+|| "java.lang".equals(name)
+|| "java.io".equals(name)
+|| "generated".equals(name)) {
+return false;
+}
+Iterator i = jpackage.classes();
+while (i.hasNext()) {
+JDefinedClass current = i.next();
+if ("ObjectFactory".equals(current.name())) { 
+return true;
+}
+}
+return false;
+}
+
 private void outputDebug(JCodeModel codeModel) {
 if (!LOG.isLoggable(Level.INFO)) {
 return;

svn commit: r658442 - in /cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java

[dkulp]

Author: dkulp
Date: Tue May 20 14:18:27 2008
New Revision: 658442

URL: http://svn.apache.org/viewvc?rev=658442&view=rev
Log:
Merged revisions 658401 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r658401 | dkulp | 2008-05-20 15:36:49 -0400 (Tue, 20 May 2008) | 2 lines
  
  [CXF-1597] Patch from hwavelet applied.  Thanks!


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?rev=658442&r1=658441&r2=658442&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
 Tue May 20 14:18:27 2008
@@ -195,7 +195,7 @@
 private void setStackTrace(Fault fault, Message msg) {
 Map ns = new HashMap();
 XPathUtils xu = new XPathUtils(ns);
-String ss = (String) xu.getValue("//" + Fault.STACKTRACE + "/text()", 
fault.getDetail(),
+String ss = (String) xu.getValue("/" + Fault.STACKTRACE + "/text()", 
fault.getDetail(),
 XPathConstants.STRING);
 List stackTraceList = new 
ArrayList();
 if (!StringUtils.isEmpty(ss)) {

svn commit: r658443 - in /cxf/branches/2.0.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ rt/frontend/simple/src/main/j

[dkulp]

Author: dkulp
Date: Tue May 20 14:21:56 2008
New Revision: 658443

URL: http://svn.apache.org/viewvc?rev=658443&view=rev
Log:
Merged revisions 658433 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r658433 | dkulp | 2008-05-20 17:08:04 -0400 (Tue, 20 May 2008) | 2 lines
  
  [CXF-1575, CXF-1592] Don't map webServiceException into the wsdl.  In some 
cases, allow an older saaj implementation.


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java

cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java

cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=658443&r1=658442&r2=658443&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
 Tue May 20 14:21:56 2008
@@ -30,6 +30,7 @@
 import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPFault;
 import javax.xml.ws.AsyncHandler;
 import javax.xml.ws.Binding;
@@ -183,31 +184,11 @@
 exception.initCause(ex);
 throw exception;
 } else if (getBinding() instanceof SOAPBinding) {
-SOAPFault soapFault = 
((SOAPBinding)getBinding()).getSOAPFactory().createFault();
+SOAPFault soapFault = createSoapFault(ex);
+if (soapFault == null) {
+throw new WebServiceException(ex);
+}
 
-if (ex instanceof SoapFault) {
-soapFault.setFaultString(((SoapFault)ex).getReason());
-soapFault.setFaultCode(((SoapFault)ex).getFaultCode());
-soapFault.setFaultActor(((SoapFault)ex).getRole());
-
-Node nd = 
soapFault.getOwnerDocument().importNode(((SoapFault)ex).getOrCreateDetail(),
-  true);
-nd = nd.getFirstChild();
-soapFault.addDetail();
-while (nd != null) {
-Node next = nd.getNextSibling();
-soapFault.getDetail().appendChild(nd);
-nd = next;
-}
- 
-} else {
-soapFault.setFaultCode(new 
QName("http://cxf.apache.org/faultcode";, "HandlerFault"));
-String msg = ex.getMessage();
-if (msg != null) {
-soapFault.setFaultString(msg);
-}
-}  
-  
 SOAPFaultException  exception = new 
SOAPFaultException(soapFault);
 exception.initCause(ex);
 throw exception;
@@ -234,6 +215,47 @@
 
 }
 
+private SOAPFault createSoapFault(Exception ex) throws SOAPException {
+SOAPFault soapFault;
+try {
+soapFault = 
((SOAPBinding)getBinding()).getSOAPFactory().createFault();
+} catch (Throwable t) {
+//probably an old version of saaj or something that is not 
allowing createFault 
+//method to work.  Try the saaj 1.2 method of doing this.
+try {
+soapFault = 
((SOAPBinding)getBinding()).getMessageFactory().createMessage()
+.getSOAPBody().addFault();
+} catch (Throwable t2) {
+//still didn't work, we'll just throw what we have
+return null;
+}
+}
+
+if (ex instanceof SoapFault) {
+soapFault.setFaultString(((SoapFault)ex).getReason());
+soapFault.setFaultCode(((SoapFault)ex).getFaultCode());
+soapFault.setFaultActor(((SoapFault)ex).getRole());
+
+Node nd = 
soapFault.getOwnerDocument().importNode(((SoapFault)ex).getOrCreateDetail(),
+  true);
+nd = nd.getFirstChild();
+soapFault.addDetail();
+while 

svn commit: r658519 - /cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

[dkulp]

Author: dkulp
Date: Tue May 20 18:07:05 2008
New Revision: 658519

URL: http://svn.apache.org/viewvc?rev=658519&view=rev
Log:
Fix compile failure

Modified:

cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Modified: 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=658519&r1=658518&r2=658519&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 Tue May 20 18:07:05 2008
@@ -1391,9 +1391,6 @@
 if (mpi != null) {
 mpi.setTypeClass(rawClass);
 mpi.setProperty(GENERIC_TYPE, type);
-if (Collection.class.isAssignableFrom(rawClass)) {
-mpi.setProperty(RAW_CLASS, type);
-}
 }
 }
 if 
(!Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.MODE_OUT))) 
{
@@ -1401,9 +1398,6 @@
 if (mpi != null) {
 mpi.setTypeClass(rawClass);
 mpi.setProperty(GENERIC_TYPE, type);
-if (Collection.class.isAssignableFrom(rawClass)) {
-mpi.setProperty(RAW_CLASS, type);
-}
 }
 }
 }  

svn commit: r658766 - in /cxf/trunk: api/src/main/java/org/apache/cxf/tools/common/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/ tools/wsdlto/databinding/jaxb/src/main/java/org/apache/c

[dkulp]

Author: dkulp
Date: Wed May 21 10:16:36 2008
New Revision: 658766

URL: http://svn.apache.org/viewvc?rev=658766&view=rev
Log:
[CXF-1600, CXF-1601] 
* Add -autoNameResolution flag to wsdl2java to have it handle jaxb classname 
conflicts automatically instead of requiring a jaxb bindings file.
* Fix some issues of mapping out-of-band headers out of wsdl

Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java

cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java

cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java

cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java

cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=658766&r1=658765&r2=658766&view=diff
==
--- cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java 
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java 
Wed May 21 10:16:36 2008
@@ -44,6 +44,7 @@
 public static final String CFG_VERBOSE = "verbose";
 public static final String CFG_PORT = "port";
 public static final String CFG_BINDING = "binding";
+public static final String CFG_AUTORESOLVE = "autoNameResolution";
 public static final String CFG_WEBSERVICE = "webservice";
 public static final String CFG_SERVER = "server";
 public static final String CFG_CLIENT = "client";

Modified: 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=658766&r1=658765&r2=658766&view=diff
==
--- 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 (original)
+++ 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 Wed May 21 10:16:36 2008
@@ -403,7 +403,7 @@
 if (def != null && schemas != null) {
 javax.wsdl.Message msg = def.getMessage(header.getMessage());
 if (msg != null) {
-addOutOfBandParts(bop, msg, schemas, isInput);
+addOutOfBandParts(bop, msg, schemas, isInput, 
header.getPart());
 serviceInfo.refresh();
 } else {
 throw new RuntimeException("Header message not defined in 
service model.");
@@ -413,7 +413,8 @@
 }
 
 private void addOutOfBandParts(final BindingOperationInfo bop, final 
javax.wsdl.Message msg,
-   final SchemaCollection schemas, boolean 
isInput) {
+   final SchemaCollection schemas, boolean 
isInput,
+   final String partName) {
 MessageInfo minfo = null;
 MessageInfo.Type type;
 
@@ -446,7 +447,7 @@
 if (minfo == null) {
 minfo = new MessageInfo(null, type, msg.getQName());
 }
-buildMessage(minfo, msg, schemas, nextId);
+buildMessage(minfo, msg, schemas, nextId, partName);
 
 // for wrapped style
 OperationInfo unwrapped = 
bop.getOperationInfo().getUnwrappedOperation();
@@ -485,29 +486,35 @@
 if (minfo == null) {
 minfo = new MessageInfo(unwrapped, type, msg.getQName());
 }
-buildMessage(minfo, msg, schemas, nextId);
+buildMessage(minfo, msg, schemas, nextId, partName);
 }
 
 private void buildMessage(MessageInfo minfo,
   javax.wsdl.Message msg,
   SchemaCollection schemas,
-  int nextId) {
+  int nextId,
+  String partNameFilter) {
 for (Part part : cast(msg.getParts().values(), Part.class)) {
-MessagePartInfo pi = minfo.addMessagePart(new 
QName(minfo.getName().getNamespaceURI(), part
-.getName()));
-if (part.getTypeName() != null) {
-pi.setTypeQName(part.getTypeName());
-pi.setElement(false);
-pi.setXmlSchema(schemas.getTypeByQName(part.getTypeName()));
-} else {
-pi.setElementQName(part.getElementName());
-

svn commit: r658770 - in /cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/tools/common/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/ tools/wsdlto/databinding/jaxb/src/main

[dkulp]

Author: dkulp
Date: Wed May 21 10:26:37 2008
New Revision: 658770

URL: http://svn.apache.org/viewvc?rev=658770&view=rev
Log:
Merged revisions 658766 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r658766 | dkulp | 2008-05-21 13:16:36 -0400 (Wed, 21 May 2008) | 4 lines
  
  [CXF-1600, CXF-1601] 
  * Add -autoNameResolution flag to wsdl2java to have it handle jaxb classname 
conflicts automatically instead of requiring a jaxb bindings file.
  * Fix some issues of mapping out-of-band headers out of wsdl


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java

cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java

cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java

cxf/branches/2.0.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java

cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=658770&r1=658769&r2=658770&view=diff
==
--- 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
 Wed May 21 10:26:37 2008
@@ -38,6 +38,7 @@
 public static final String CFG_VERBOSE = "verbose";
 public static final String CFG_PORT = "port";
 public static final String CFG_BINDING = "binding";
+public static final String CFG_AUTORESOLVE = "autoNameResolution";
 public static final String CFG_WEBSERVICE = "webservice";
 public static final String CFG_SERVER = "server";
 public static final String CFG_CLIENT = "client";

Modified: 
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=658770&r1=658769&r2=658770&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 Wed May 21 10:26:37 2008
@@ -403,7 +403,7 @@
 if (def != null && schemas != null) {
 javax.wsdl.Message msg = def.getMessage(header.getMessage());
 if (msg != null) {
-addOutOfBandParts(bop, msg, schemas, isInput);
+addOutOfBandParts(bop, msg, schemas, isInput, 
header.getPart());
 serviceInfo.refresh();
 } else {
 throw new RuntimeException("Header message not defined in 
service model.");
@@ -413,7 +413,8 @@
 }
 
 private void addOutOfBandParts(final BindingOperationInfo bop, final 
javax.wsdl.Message msg,
-   final SchemaCollection schemas, boolean 
isInput) {
+   final SchemaCollection schemas, boolean 
isInput,
+   final String partName) {
 MessageInfo minfo = null;
 int nextId = 0;
 minfo = bop.getOperationInfo().getInput();
@@ -442,7 +443,7 @@
 if (minfo == null) {
 minfo = new MessageInfo(null, msg.getQName());
 }
-buildMessage(minfo, msg, schemas, nextId);
+buildMessage(minfo, msg, schemas, nextId, partName);
 
 // for wrapped style
 OperationInfo unwrapped = 
bop.getOperationInfo().getUnwrappedOperation();
@@ -478,29 +479,35 @@
 if (minfo == null) {
 minfo = new MessageInfo(unwrapped, msg.getQName());
 }
-buildMessage(minfo, msg, schemas, nextId);
+buildMessage(minfo, msg, schemas, nextId, partName);
 }
 
 private void buildMessage(MessageInfo minfo,
   javax.wsdl.Message msg,
   SchemaCollection schemas,
-  int nextId) {
+   

svn commit: r659126 - /cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java

[dkulp]

Author: dkulp
Date: Thu May 22 07:49:03 2008
New Revision: 659126

URL: http://svn.apache.org/viewvc?rev=659126&view=rev
Log:
[CXF-1603] Add another NPE guard, fix from Benjamin Coiffe applied

Modified:

cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java

Modified: 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=659126&r1=659125&r2=659126&view=diff
==
--- 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 (original)
+++ 
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 Thu May 22 07:49:03 2008
@@ -632,7 +632,7 @@
 bmsg.getMessageParts().remove(mpi);
 } else if (SOAPBindingUtil.isSOAPBody(content)) {
 SoapBody sb = SOAPBindingUtil.getSoapBody(content);
-if (sb.getParts().size() == 1) {
+if (sb.getParts() != null && sb.getParts().size() 
== 1) {
 partName = (String) sb.getParts().get(0);
 }
 

svn commit: r659141 - in /cxf/trunk: rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTe

[dkulp]

Author: dkulp
Date: Thu May 22 09:02:15 2008
New Revision: 659141

URL: http://svn.apache.org/viewvc?rev=659141&view=rev
Log:
[CXF-1604] Fix NPE issues with null Lists being sent as wrapped doc/lit params

Modified:

cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java?rev=659141&r1=659140&r2=659141&view=diff
==
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
 Thu May 22 09:02:15 2008
@@ -301,7 +301,7 @@
 // List newA = (List)lst.get(99);
 // if (aVal == null) {
 // obj.setA(newA);
-// } else {
+// } else if (newA != null) {
 // aVal.addAll(newA);
 // }
 
@@ -341,6 +341,8 @@
 Label jumpOverLabel = new Label();
 mv.visitJumpInsn(Opcodes.GOTO, jumpOverLabel);
 mv.visitLabel(nonNullLabel);
+mv.visitVarInsn(Opcodes.ALOAD, 4);
+mv.visitJumpInsn(Opcodes.IFNULL, jumpOverLabel);
 mv.visitVarInsn(Opcodes.ALOAD, 3);
 mv.visitVarInsn(Opcodes.ALOAD, 4);
 mv.visitMethodInsn(Opcodes.INVOKEINTERFACE,

Modified: 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java?rev=659141&r1=659140&r2=659141&view=diff
==
--- 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
 (original)
+++ 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
 Thu May 22 09:02:15 2008
@@ -2074,6 +2074,9 @@
 assertTrue("testStringList(): Incorrect value for out param", 
yOrig.equals(z.value));
 assertTrue("testStringList(): Incorrect return value", 
x.equals(ret));
 }
+if (testDocLiteral) {
+ret = docClient.testStringList(null, y, z);
+}
 } else {
 String[] x = {"I", "am", "SimpleList"};
 String[] yOrig = {"Does", "SimpleList", "Work"};

svn commit: r659142 - in /cxf/branches/2.0.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java

[dkulp]

Author: dkulp
Date: Thu May 22 09:18:02 2008
New Revision: 659142

URL: http://svn.apache.org/viewvc?rev=659142&view=rev
Log:
Merged revisions 659126 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r659126 | dkulp | 2008-05-22 10:49:03 -0400 (Thu, 22 May 2008) | 2 lines
  
  [CXF-1603] Add another NPE guard, fix from Benjamin Coiffe applied


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=659142&r1=659141&r2=659142&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
 Thu May 22 09:18:02 2008
@@ -625,7 +625,7 @@
 bmsg.getMessageParts().remove(mpi);
 } else if (SOAPBindingUtil.isSOAPBody(content)) {
 SoapBody sb = SOAPBindingUtil.getSoapBody(content);
-if (sb.getParts().size() == 1) {
+if (sb.getParts() != null && sb.getParts().size() 
== 1) {
 partName = (String) sb.getParts().get(0);
 }
 

svn commit: r659144 - in /cxf/branches/2.0.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java systests/src/test/java/org/apache/cxf/systest/type_t

[dkulp]

Author: dkulp
Date: Thu May 22 09:22:28 2008
New Revision: 659144

URL: http://svn.apache.org/viewvc?rev=659144&view=rev
Log:
Merged revisions 659141 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r659141 | dkulp | 2008-05-22 12:02:15 -0400 (Thu, 22 May 2008) | 2 lines
  
  [CXF-1604] Fix NPE issues with null Lists being sent as wrapped doc/lit params


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java

cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java?rev=659144&r1=659143&r2=659144&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
 Thu May 22 09:22:28 2008
@@ -358,13 +358,13 @@
 }
 
 private void doCollection(MethodVisitor mv, int x) {
-//List aVal = obj.getA();
-//List newA = (List)lst.get(99);
-//if (aVal == null) {
-//obj.setA(newA);
-//} else {
-//aVal.addAll(newA);
-//}
+// List aVal = obj.getA();
+// List newA = (List)lst.get(99);
+// if (aVal == null) {
+// obj.setA(newA);
+// } else if (newA != null) {
+// aVal.addAll(newA);
+// }
 
 mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
periodToSlashes(wrapperType.getName()),
@@ -402,6 +402,8 @@
 Label jumpOverLabel = new Label();
 mv.visitJumpInsn(Opcodes.GOTO, jumpOverLabel);
 mv.visitLabel(nonNullLabel);
+mv.visitVarInsn(Opcodes.ALOAD, 4);
+mv.visitJumpInsn(Opcodes.IFNULL, jumpOverLabel);
 mv.visitVarInsn(Opcodes.ALOAD, 3);
 mv.visitVarInsn(Opcodes.ALOAD, 4);
 mv.visitMethodInsn(Opcodes.INVOKEINTERFACE,

Modified: 
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java?rev=659144&r1=659143&r2=659144&view=diff
==
--- 
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
 Thu May 22 09:22:28 2008
@@ -1892,6 +1892,9 @@
 assertTrue("testStringList(): Incorrect value for out param", 
yOrig.equals(z.value));
 assertTrue("testStringList(): Incorrect return value", 
x.equals(ret));
 }
+if (testDocLiteral) {
+ret = docClient.testStringList(null, y, z);
+}
 } else {
 String[] x = {"I", "am", "SimpleList"};
 String[] yOrig = {"Does", "SimpleList", "Work"};

svn commit: r659145 - /cxf/branches/2.0.x-fixes/

[dkulp]

Author: dkulp
Date: Thu May 22 09:28:33 2008
New Revision: 659145

URL: http://svn.apache.org/viewvc?rev=659145&view=rev
Log:
Blocked revisions 
655641,656484,656605,656684,656700,656715,657015,657272,657330,657376,657470,657480-657482,657490,658386
 via svnmerge


  r655641 | dkulp | 2008-05-12 17:09:02 -0400 (Mon, 12 May 2008) | 2 lines
  
  [CXF-1583,CXF-1584] Patches for issues with the classpath and dynamic client 
applied from Alton Idowu

  r656484 | dkulp | 2008-05-14 21:11:09 -0400 (Wed, 14 May 2008) | 2 lines
  
  Fix https stuff on my mac, remove some unneeded bus lines.

  r656605 | ffang | 2008-05-15 08:02:40 -0400 (Thu, 15 May 2008) | 1 line
  
  [CXF-1588]NullPointerException in JbiConduitOutputStream

  r656684 | seanoc | 2008-05-15 10:40:23 -0400 (Thu, 15 May 2008) | 2 lines
  
  Fixed http://issues.apache.org/jira/browse/CXF-1512
  Added support for  customisation

  r656700 | seanoc | 2008-05-15 11:28:34 -0400 (Thu, 15 May 2008) | 1 line
  
  fix failing test assertion

  r656715 | seanoc | 2008-05-15 12:00:42 -0400 (Thu, 15 May 2008) | 1 line
  
  fix assertion failure

  r657015 | seanoc | 2008-05-16 06:57:06 -0400 (Fri, 16 May 2008) | 1 line
  
  remove System.out, uncommented a test

  r657272 | bimargulies | 2008-05-16 21:30:34 -0400 (Fri, 16 May 2008) | 5 lines
  
  Remove uses of unsafe String constructors.
  
  Also scratch the initial surface of controlling the element form in 
  Aegis.

  r657330 | bimargulies | 2008-05-17 07:16:23 -0400 (Sat, 17 May 2008) | 3 lines
  
  Remove wrongheaded start on qualification control for Aegis. Add bean
  for use in future unit test.

  r657376 | bimargulies | 2008-05-17 11:31:09 -0400 (Sat, 17 May 2008) | 2 lines
  
  Make attributes unqualified by defaul in Aegis, etc.

  r657470 | bimargulies | 2008-05-17 18:44:44 -0400 (Sat, 17 May 2008) | 2 lines
  
  Add failing (@Ignored) test case for Aegis vs. Dynamic client.

  r657480 | bimargulies | 2008-05-17 19:59:15 -0400 (Sat, 17 May 2008) | 2 lines
  
  Extend qualification control to XML .aegis files.

  r657481 | bimargulies | 2008-05-17 20:02:25 -0400 (Sat, 17 May 2008) | 2 lines
  
  Fix up javadoc related to qualification control.

  r657482 | bimargulies | 2008-05-17 20:18:00 -0400 (Sat, 17 May 2008) | 2 lines
  
  Copy a class to avoid dependency from systest to Aegis test.

  r657490 | bimargulies | 2008-05-17 22:14:34 -0400 (Sat, 17 May 2008) | 2 lines
  
  Fix CXF-1587

  r658386 | dkulp | 2008-05-20 14:41:36 -0400 (Tue, 20 May 2008) | 2 lines
  
  Fix some tooling to map ws-addressing elements to the appropriate EPR if we 
can.


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-blocked' - no diff available.

svn commit: r659342 - /cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java

[dkulp]

Author: dkulp
Date: Thu May 22 17:39:03 2008
New Revision: 659342

URL: http://svn.apache.org/viewvc?rev=659342&view=rev
Log:
Make sure only the checked exceptions are marked as checked.

Modified:

cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java

Modified: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java?rev=659342&r1=659341&r2=659342&view=diff
==
--- 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
 (original)
+++ 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
 Thu May 22 17:39:03 2008
@@ -91,8 +91,17 @@
 if (t == null) {
 t = e;
 }
-exchange.getInMessage().put(FaultMode.class, 
FaultMode.CHECKED_APPLICATION_FAULT);
+exchange.getInMessage().put(FaultMode.class, 
FaultMode.UNCHECKED_APPLICATION_FAULT);
+for (Class cl : m.getExceptionTypes()) {
+if (cl.isInstance(t)) {
+exchange.getInMessage().put(FaultMode.class, 
+
FaultMode.CHECKED_APPLICATION_FAULT);
+}
+}
+
 if (t instanceof Fault) {
+exchange.getInMessage().put(FaultMode.class, 
+
FaultMode.CHECKED_APPLICATION_FAULT);
 throw (Fault)t;
 }
 throw createFault(t, m, params, true);

svn commit: r660620 - /cxf/trunk/maven-plugins/wsdl-validator-plugin/

[dkulp]

Author: dkulp
Date: Tue May 27 10:27:43 2008
New Revision: 660620

URL: http://svn.apache.org/viewvc?rev=660620&view=rev
Log:
Add svn:ignore

Modified:
cxf/trunk/maven-plugins/wsdl-validator-plugin/   (props changed)

Propchange: cxf/trunk/maven-plugins/wsdl-validator-plugin/
--
--- svn:ignore (added)
+++ svn:ignore Tue May 27 10:27:43 2008
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
+

svn commit: r660623 - in /cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java

[dkulp]

Author: dkulp
Date: Tue May 27 10:29:26 2008
New Revision: 660623

URL: http://svn.apache.org/viewvc?rev=660623&view=rev
Log:
Merged revisions 659648 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r659648 | bimargulies | 2008-05-23 16:26:01 -0400 (Fri, 23 May 2008) | 2 lines
  
  Try harder to avoid blowing up for old XML parsers.


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java?rev=660623&r1=660622&r2=660623&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 Tue May 27 10:29:26 2008
@@ -114,9 +114,11 @@
 DocumentBuilderFactory factory = 
super.createDocumentBuilderFactory(validationMode, namespaceAware);
 try {
 
factory.setFeature("http://apache.org/xml/features/dom/defer-node-expansion";, 
false);
-} catch (ParserConfigurationException pce) {
-// blank
+} catch (Exception e) {
+// we can get all kinds of exceptions from this
+// due to old copies of Xerces and whatnot.
 }
+
 return factory;
 }
 

svn commit: r660627 - in /cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java

[dkulp]

Author: dkulp
Date: Tue May 27 10:59:48 2008
New Revision: 660627

URL: http://svn.apache.org/viewvc?rev=660627&view=rev
Log:
Merged revisions 659656 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r659656 | bimargulies | 2008-05-23 16:55:14 -0400 (Fri, 23 May 2008) | 2 lines
  
  Try again to catch enough exceptions.


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java?rev=660627&r1=660626&r2=660627&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 Tue May 27 10:59:48 2008
@@ -67,7 +67,7 @@
 Class cls = 
Class.forName("com.ctc.wstx.sax.WstxSAXParserFactory");
 saxParserFactory = (SAXParserFactory)cls.newInstance();
 nsasaxParserFactory = (SAXParserFactory)cls.newInstance();
-} catch (Exception e) {
+} catch (Throwable e) {
 //woodstox not found, use any other Stax parser
 saxParserFactory = SAXParserFactory.newInstance();
 nsasaxParserFactory = SAXParserFactory.newInstance();
@@ -77,7 +77,7 @@
 
nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespaces";, true); 
 
nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes";,
 
true);
-} catch (Exception e) {
+} catch (Throwable e) {
 //ignore
 }
 }
@@ -114,7 +114,7 @@
 DocumentBuilderFactory factory = 
super.createDocumentBuilderFactory(validationMode, namespaceAware);
 try {
 
factory.setFeature("http://apache.org/xml/features/dom/defer-node-expansion";, 
false);
-} catch (Exception e) {
+} catch (Throwable e) {
 // we can get all kinds of exceptions from this
 // due to old copies of Xerces and whatnot.
 }

svn commit: r660949 - /cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java

[dkulp]

Author: dkulp
Date: Wed May 28 06:37:50 2008
New Revision: 660949

URL: http://svn.apache.org/viewvc?rev=660949&view=rev
Log:
Merge jgenenders fix from the 2.0.x branch to trunk

Modified:

cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java

Modified: 
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java?rev=660949&r1=660948&r2=660949&view=diff
==
--- 
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java
 (original)
+++ 
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/URIParameterInInterceptor.java
 Wed May 28 06:37:50 2008
@@ -88,7 +88,7 @@
 MessagePartInfo part = parts.get(0);
 
 List params = null;
-if ("application/x-www-form-urlencoded.".equals(contentType)) {
+if ("application/x-www-form-urlencoded".equals(contentType)) {
 params = IriDecoderHelper.decode(path, location, 
message.getContent(InputStream.class));
 } else if ("application/xml".equals(contentType)) {
 params = IriDecoderHelper.decodeIri(path, location);

svn commit: r661064 - in /cxf/trunk: common/common/src/main/java/org/apache/cxf/staxutils/ parent/ rt/core/src/main/java/org/apache/cxf/interceptor/ rt/javascript/ systests/src/test/java/org/apache/cx

[dkulp]

Author: dkulp
Date: Wed May 28 13:02:59 2008
New Revision: 661064

URL: http://svn.apache.org/viewvc?rev=661064&view=rev
Log:
[CXF-1551, CXF-1614] Cache xml events when validating and flush them out only 
if validation succeeds

Added:

cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
   (with props)
Modified:

cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
cxf/trunk/parent/pom.xml

cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
cxf/trunk/rt/javascript/pom.xml

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java

Added: 
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java?rev=661064&view=auto
==
--- 
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
 (added)
+++ 
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
 Wed May 28 13:02:59 2008
@@ -0,0 +1,277 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.staxutils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLEventFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.stream.events.XMLEvent;
+
+import org.apache.cxf.common.util.StringUtils;
+
+
+/**
+ * 
+ */
+public class CachingXmlEventWriter implements XMLStreamWriter {
+protected XMLEventFactory factory;
+
+List events = new ArrayList(1000);
+Stack contexts = new Stack();
+Stack elNames = new Stack();
+QName lastStart;
+NSContext curContext = new NSContext(null);
+
+public CachingXmlEventWriter() {
+factory = XMLEventFactory.newInstance();
+}
+
+protected void addEvent(XMLEvent event) {
+events.add(event);
+}
+
+public List getEvents() {
+return events;
+}
+
+public void close() throws XMLStreamException {
+//nothing
+}
+
+public void flush() throws XMLStreamException {
+//nothing
+}
+
+public NamespaceContext getNamespaceContext() {
+return curContext;
+}
+
+public String getPrefix(String ns) throws XMLStreamException {
+return curContext.getPrefix(ns);
+}
+
+public Object getProperty(String arg0) throws IllegalArgumentException {
+//nothing
+return null;
+}
+
+
+public void setNamespaceContext(NamespaceContext arg0) throws 
XMLStreamException {
+curContext = new NSContext(arg0);
+}
+
+public void writeAttribute(String name, String value) throws 
XMLStreamException {
+addEvent(factory.createAttribute(name, value));
+}
+
+public void writeAttribute(String pfx, String uri, String name, String 
value) throws XMLStreamException {
+addEvent(factory.createAttribute(pfx, uri, name, value));
+}
+
+public void writeCData(String arg0) throws XMLStreamException {
+addEvent(factory.createCData(arg0));
+}
+
+public void writeCharacters(String arg0) throws XMLStreamException {
+addEvent(factory.createCharacters(arg0));
+}
+
+public void writeCharacters(char[] arg0, int arg1, int arg2) throws 
XMLStreamException {
+addEvent(factory.createCharacters(new String(arg0, arg1, arg2)));  
  
+}
+
+public void writeComment(String arg0) throws XMLStreamException {
+addEvent(factory.createComment(arg0));
+}
+
+public void writeDTD(String arg0) throws XMLStreamException {
+add

svn commit: r661070 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/ parent/ rt/core/src/main/java/org/apache/cxf/interceptor/ systests/src/test/java/org/apache

[dkulp]

Author: dkulp
Date: Wed May 28 13:24:48 2008
New Revision: 661070

URL: http://svn.apache.org/viewvc?rev=661070&view=rev
Log:
Merged revisions 661064 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r661064 | dkulp | 2008-05-28 16:02:59 -0400 (Wed, 28 May 2008) | 2 lines
  
  [CXF-1551, CXF-1614] Cache xml events when validating and flush them out only 
if validation succeeds


Added:

cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
  - copied unchanged from r661064, 
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
cxf/branches/2.0.x-fixes/parent/pom.xml

cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java

cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java

cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=661070&r1=661069&r2=661070&view=diff
==
--- 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
 Wed May 28 13:24:48 2008
@@ -25,6 +25,7 @@
 import java.io.Writer;
 //import java.util.HashMap;
 //import java.util.Map;
+import java.util.Iterator;
 import java.util.logging.Logger;
 
 import javax.xml.namespace.NamespaceContext;
@@ -38,6 +39,12 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.stream.events.Attribute;
+import javax.xml.stream.events.DTD;
+import javax.xml.stream.events.Namespace;
+import javax.xml.stream.events.StartDocument;
+import javax.xml.stream.events.StartElement;
+import javax.xml.stream.events.XMLEvent;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
@@ -875,4 +882,113 @@
 LOG.severe(e.getMessage());
 }
 }
+
+
+private static void writeStartElementEvent(XMLEvent event, XMLStreamWriter 
writer) 
+throws XMLStreamException {
+StartElement start = event.asStartElement();
+QName name = start.getName();
+String nsURI = name.getNamespaceURI();
+String localName = name.getLocalPart();
+String prefix = name.getPrefix();
+
+if (prefix != null) {
+writer.writeStartElement(prefix, localName, nsURI);
+} else if (nsURI != null) {
+writer.writeStartElement(localName, nsURI);
+} else {
+writer.writeStartElement(localName);
+}
+Iterator it = start.getNamespaces();
+while (it != null && it.hasNext()) {
+writeEvent((XMLEvent)it.next(), writer);
+}
+
+it = start.getAttributes();
+while (it != null && it.hasNext()) {
+writeAttributeEvent((Attribute)it.next(), writer);
+}
+}
+private static void writeAttributeEvent(XMLEvent event, XMLStreamWriter 
writer) 
+throws XMLStreamException {
+
+Attribute attr = (Attribute)event;
+QName name = attr.getName();
+String nsURI = name.getNamespaceURI();
+String localName = name.getLocalPart();
+String prefix = name.getPrefix();
+String value = attr.getValue();
+
+if (prefix != null) {
+writer.writeAttribute(prefix, nsURI, localName, value);
+} else if (nsURI != null) {
+writer.writeAttribute(nsURI, localName, value);
+} else {
+writer.writeAttribute(localName, value);
+}
+}
+
+public static void writeEvent(XMLEvent event, XMLStreamWriter writer)
+throws XMLStreamException {
+
+switch (event.getEventType()) {
+case XMLEvent.START_ELEMENT:
+writeStartElementEvent(event, writer);
+break;
+case XMLEvent.END_ELEMENT:
+writer.writeEndElement();
+break;
+case XMLEvent.ATTRIBUTE: 
+writeAttributeEvent(event, writer);
+brea

svn commit: r661076 - in /cxf/trunk: rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTe

[dkulp]

Author: dkulp
Date: Wed May 28 13:48:44 2008
New Revision: 661076

URL: http://svn.apache.org/viewvc?rev=661076&view=rev
Log:
add some fake line numbers into the generated wrapper helper to hopefully help 
debugging

Modified:

cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java

cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java?rev=661076&r1=661075&r2=661076&view=diff
==
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
 Wed May 28 13:48:44 2008
@@ -166,10 +166,12 @@
 mv.visitCode();
 Label l0 = new Label();
 mv.visitLabel(l0);
+mv.visitLineNumber(100, l0);
 mv.visitLdcInsn(sig);
 mv.visitInsn(Opcodes.ARETURN);
 Label l1 = new Label();
 mv.visitLabel(l1);
+mv.visitLineNumber(101, l1);
 mv.visitMaxs(0, 0);
 mv.visitEnd();
 return true;
@@ -189,6 +191,7 @@
 mv.visitCode();
 Label l0 = new Label();
 mv.visitLabel(l0);
+mv.visitLineNumber(102, l0);
 
 mv.visitVarInsn(Opcodes.ALOAD, 0);
 mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
@@ -210,6 +213,8 @@
 
 Label l1 = new Label();
 mv.visitLabel(l1);
+mv.visitLineNumber(103, l0);
+
 mv.visitLocalVariable("this", "L" + newClassName + ";", null, l0, l1, 
0);
 mv.visitMaxs(0, 0);
 mv.visitEnd();
@@ -228,7 +233,8 @@
 mv.visitCode();
 Label lBegin = new Label();
 mv.visitLabel(lBegin);
-
+mv.visitLineNumber(104, lBegin);
+
 mv.visitTypeInsn(Opcodes.NEW, periodToSlashes(wrapperType.getName()));
 mv.visitInsn(Opcodes.DUP);
 mv.visitMethodInsn(Opcodes.INVOKESPECIAL, 
periodToSlashes(wrapperType.getName()),
@@ -287,6 +293,7 @@
 
 Label lEnd = new Label();
 mv.visitLabel(lEnd);
+mv.visitLineNumber(105, lEnd);
 mv.visitLocalVariable("this", "L" + newClassName + ";", null, lBegin, 
lEnd, 0);
 mv.visitLocalVariable("lst", "Ljava/util/List;", 
"Ljava/util/List<*>;", lBegin, lEnd, 1);
 mv.visitLocalVariable("ok", "L" + 
periodToSlashes(wrapperType.getName()) + ";",
@@ -305,6 +312,10 @@
 // aVal.addAll(newA);
 // }
 
+Label l3 = new Label();
+mv.visitLabel(l3);
+mv.visitLineNumber(114, l3);
+
 mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
periodToSlashes(wrapperType.getName()),
getMethods[x].getName(),
@@ -341,6 +352,8 @@
 Label jumpOverLabel = new Label();
 mv.visitJumpInsn(Opcodes.GOTO, jumpOverLabel);
 mv.visitLabel(nonNullLabel);
+mv.visitLineNumber(106, nonNullLabel);
+
 mv.visitVarInsn(Opcodes.ALOAD, 4);
 mv.visitJumpInsn(Opcodes.IFNULL, jumpOverLabel);
 mv.visitVarInsn(Opcodes.ALOAD, 3);
@@ -349,7 +362,7 @@
"java/util/List", "addAll", 
"(Ljava/util/Collection;)Z");
 mv.visitInsn(Opcodes.POP);
 mv.visitLabel(jumpOverLabel);
-
+mv.visitLineNumber(107, jumpOverLabel);
 }
 
 private static boolean addGetWrapperParts(String newClassName,
@@ -367,6 +380,7 @@
 mv.visitCode();
 Label lBegin = new Label();
 mv.visitLabel(lBegin);
+mv.visitLineNumber(108, lBegin);

 // the ret List
 mv.visitTypeInsn(Opcodes.NEW, "java/util/ArrayList");
@@ -387,12 +401,20 @@
 }
 
 if (method == null) {
+Label l3 = new Label();
+mv.visitLabel(l3);
+mv.visitLineNumber(200 + x, l3);
+
 mv.visitVarInsn(Opcodes.ALOAD, 2);
 mv.visitInsn(Opcodes.ACONST_NULL);
 mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List",
"add", "(Ljava/lang/Object;)Z");
 mv.visitInsn(Opcodes.POP);
 } else {
+Label l3 = new Label();
+mv.visitLabel(l3);
+mv.visitLineNumber(250 + x, l3);
+
 mv.visitVarInsn(Opcodes.ALOAD, 2);

svn commit: r661078 - in /cxf/branches/2.0.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java systests/src/test/java/org/apache/cxf/systest/type_t

[dkulp]

Author: dkulp
Date: Wed May 28 13:49:50 2008
New Revision: 661078

URL: http://svn.apache.org/viewvc?rev=661078&view=rev
Log:
Merged revisions 661076 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r661076 | dkulp | 2008-05-28 16:48:44 -0400 (Wed, 28 May 2008) | 2 lines
  
  add some fake line numbers into the generated wrapper helper to hopefully 
help debugging


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java

cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java?rev=661078&r1=661077&r2=661078&view=diff
==
--- 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelperCompiler.java
 Wed May 28 13:49:50 2008
@@ -227,10 +227,12 @@
 mv.visitCode();
 Label l0 = new Label();
 mv.visitLabel(l0);
+mv.visitLineNumber(100, l0);
 mv.visitLdcInsn(sig);
 mv.visitInsn(Opcodes.ARETURN);
 Label l1 = new Label();
 mv.visitLabel(l1);
+mv.visitLineNumber(101, l1);
 mv.visitMaxs(0, 0);
 mv.visitEnd();
 return true;
@@ -250,6 +252,7 @@
 mv.visitCode();
 Label l0 = new Label();
 mv.visitLabel(l0);
+mv.visitLineNumber(102, l0);
 
 mv.visitVarInsn(Opcodes.ALOAD, 0);
 mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
@@ -271,6 +274,8 @@
 
 Label l1 = new Label();
 mv.visitLabel(l1);
+mv.visitLineNumber(103, l0);
+
 mv.visitLocalVariable("this", "L" + newClassName + ";", null, l0, l1, 
0);
 mv.visitMaxs(0, 0);
 mv.visitEnd();
@@ -289,7 +294,8 @@
 mv.visitCode();
 Label lBegin = new Label();
 mv.visitLabel(lBegin);
-
+mv.visitLineNumber(104, lBegin);
+
 mv.visitTypeInsn(Opcodes.NEW, periodToSlashes(wrapperType.getName()));
 mv.visitInsn(Opcodes.DUP);
 mv.visitMethodInsn(Opcodes.INVOKESPECIAL, 
periodToSlashes(wrapperType.getName()),
@@ -348,6 +354,7 @@
 
 Label lEnd = new Label();
 mv.visitLabel(lEnd);
+mv.visitLineNumber(105, lEnd);
 mv.visitLocalVariable("this", "L" + newClassName + ";", null, lBegin, 
lEnd, 0);
 mv.visitLocalVariable("lst", "Ljava/util/List;", 
"Ljava/util/List<*>;", lBegin, lEnd, 1);
 mv.visitLocalVariable("ok", "L" + 
periodToSlashes(wrapperType.getName()) + ";",
@@ -366,6 +373,10 @@
 // aVal.addAll(newA);
 // }
 
+Label l3 = new Label();
+mv.visitLabel(l3);
+mv.visitLineNumber(114, l3);
+
 mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
periodToSlashes(wrapperType.getName()),
getMethods[x].getName(),
@@ -402,6 +413,8 @@
 Label jumpOverLabel = new Label();
 mv.visitJumpInsn(Opcodes.GOTO, jumpOverLabel);
 mv.visitLabel(nonNullLabel);
+mv.visitLineNumber(106, nonNullLabel);
+
 mv.visitVarInsn(Opcodes.ALOAD, 4);
 mv.visitJumpInsn(Opcodes.IFNULL, jumpOverLabel);
 mv.visitVarInsn(Opcodes.ALOAD, 3);
@@ -410,7 +423,7 @@
"java/util/List", "addAll", 
"(Ljava/util/Collection;)Z");
 mv.visitInsn(Opcodes.POP);
 mv.visitLabel(jumpOverLabel);
-
+mv.visitLineNumber(107, jumpOverLabel);
 }
 
 private static boolean addGetWrapperParts(String newClassName,
@@ -428,6 +441,7 @@
 mv.visitCode();
 Label lBegin = new Label();
 mv.visitLabel(lBegin);
+mv.visitLineNumber(108, lBegin);

 //the ret List
 mv.visitTypeInsn(Opcodes.NEW, "java/util/ArrayList");
@@ -448,12 +462,20 @@
 }
 
 if (method == null) {
+Label l3 = new Label();
+mv.visitLabel(l3);
+mv.visitLineNumber(200 + x, l3);
+
 mv.visitVarInsn(Opcodes.ALOAD, 2);

svn commit: r661361 - /cxf/trunk/distribution/bundle/pom.xml

[dkulp]

Author: dkulp
Date: Thu May 29 08:32:43 2008
New Revision: 661361

URL: http://svn.apache.org/viewvc?rev=661361&view=rev
Log:
Update to latest shade version

Modified:
cxf/trunk/distribution/bundle/pom.xml

Modified: cxf/trunk/distribution/bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/pom.xml?rev=661361&r1=661360&r2=661361&view=diff
==
--- cxf/trunk/distribution/bundle/pom.xml (original)
+++ cxf/trunk/distribution/bundle/pom.xml Thu May 29 08:32:43 2008
@@ -308,7 +308,7 @@
 
 org.apache.maven.plugins
 maven-shade-plugin
-1.0.1
+1.1
 
 
 package

svn commit: r661367 - /cxf/trunk/parent/pom.xml

[dkulp]

Author: dkulp
Date: Thu May 29 08:43:33 2008
New Revision: 661367

URL: http://svn.apache.org/viewvc?rev=661367&view=rev
Log:
Update to latest pmd plugin

Modified:
cxf/trunk/parent/pom.xml

Modified: cxf/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=661367&r1=661366&r2=661367&view=diff
==
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu May 29 08:43:33 2008
@@ -204,7 +204,7 @@
 
 org.apache.maven.plugins
 maven-pmd-plugin
-2.3
+2.4
 
 
 org.apache.cxf

svn commit: r661406 - in /cxf/trunk/tools/corba/src/test: java/org/apache/cxf/tools/corba/processors/ resources/idlgen/ resources/wsdl/

[dkulp]

Author: dkulp
Date: Thu May 29 10:06:18 2008
New Revision: 661406

URL: http://svn.apache.org/viewvc?rev=661406&view=rev
Log:
[CXF-1611] Fix corba tests to use the cataloged schemas

Removed:
cxf/trunk/tools/corba/src/test/resources/wsdl/wsaddressing.xsd
Modified:

cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_account.wsdl
cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_bank.wsdl
cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_server.wsdl
cxf/trunk/tools/corba/src/test/resources/wsdl/factory_pattern.wsdl

Modified: 
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java?rev=661406&r1=661405&r2=661406&view=diff
==
--- 
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
 (original)
+++ 
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
 Thu May 29 10:06:18 2008
@@ -593,9 +593,6 @@
 }
 }
 
-// The ws-addr import in this wsdl fails. Ignored until cataloged
-// or otherwise dealt with --bimargulies.
-@org.junit.Ignore
 @Test
 public void testWsaddressingServerIdlgen() throws Exception {
 

Modified: 
cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_account.wsdl
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_account.wsdl?rev=661406&r1=661405&r2=661406&view=diff
==
--- cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_account.wsdl 
(original)
+++ cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_account.wsdl 
Thu May 29 10:06:18 2008
@@ -26,7 +26,7 @@
   
 http://www.apache.org/bus/demos/bank"; 
xmlns="http://www.w3.org/2001/XMLSchema";>
 
-http://www.w3.org/2005/08/addressing"; 
schemaLocation="./src/test/resources/wsdl/wsaddressing.xsd"/>
+http://www.w3.org/2005/08/addressing"; 
schemaLocation="/schemas/wsdl/ws-addr.xsd"/>
 
 
 

Modified: cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_bank.wsdl
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_bank.wsdl?rev=661406&r1=661405&r2=661406&view=diff
==
--- cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_bank.wsdl 
(original)
+++ cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_bank.wsdl Thu 
May 29 10:06:18 2008
@@ -27,7 +27,7 @@
   
 http://www.apache.org/bus/demos/bank"; 
xmlns="http://www.w3.org/2001/XMLSchema";>
 
-http://www.w3.org/2005/08/addressing"; 
schemaLocation="./src/test/resources/wsdl/wsaddressing.xsd"/>
+http://www.w3.org/2005/08/addressing"; 
schemaLocation="/schemas/wsdl/ws-addr.xsd"/>
 
 
 

Modified: 
cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_server.wsdl
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_server.wsdl?rev=661406&r1=661405&r2=661406&view=diff
==
--- cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_server.wsdl 
(original)
+++ cxf/trunk/tools/corba/src/test/resources/idlgen/wsaddressing_server.wsdl 
Thu May 29 10:06:18 2008
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-addressing
+
 http://schemas.apache.org/idl/c/epr.idl"; 
  xmlns:tns="http://schemas.apache.org/idl/c/epr.idl"; 
@@ -34,15 +34,14 @@
   
   
 http://schemas.apache.org/idltypes/c/epr.idl"; 
xmlns="http://www.w3.org/2001/XMLSchema"; 
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
- http://www.w3.org/2001/XMLSchema"; 
- namespace="http://www.w3.org/2005/08/addressing"; 
- schemaLocation="./src/test/resources/wsdl/wsaddressing.xsd"/>
+ http://www.w3.org/2005/08/addressing"; 
+ schemaLocation="/schemas/wsdl/ws-addr.xsd"/>
 
   
   
   
   
-
+
   
   
 

Modified: cxf/trunk/tools/corba/src/test/resources/wsdl/factory_pattern.wsdl
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/

svn commit: r661409 - in /cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common: DataTypeAdapter.java Messages.properties

[dkulp]

Author: dkulp
Date: Thu May 29 10:23:34 2008
New Revision: 661409

URL: http://svn.apache.org/viewvc?rev=661409&view=rev
Log:
[CXF-1602] Add better fault message 

Modified:

cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java

cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties

Modified: 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java?rev=661409&r1=661408&r2=661409&view=diff
==
--- 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
 (original)
+++ 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
 Thu May 29 10:23:34 2008
@@ -20,9 +20,17 @@
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.logging.Logger;
+
 import javax.xml.bind.DatatypeConverter;
 
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.interceptor.Fault;
+
 public final class DataTypeAdapter {
+private static final Logger LOG = 
LogUtils.getL7dLogger(DataTypeAdapter.class);
+
 private DataTypeAdapter() {
 }
 
@@ -30,6 +38,9 @@
 return DatatypeConverter.parseDate(s).getTime();
 }
 public static String printDate(Date dt) {
+if (dt == null) {
+throw new Fault(new Message("NULL_PASSED_FOR_DATE", LOG));
+}
 Calendar c = Calendar.getInstance();
 c.setTime(dt);
 return DatatypeConverter.printDate(c);
@@ -39,6 +50,9 @@
 return DatatypeConverter.parseTime(s).getTime();
 }
 public static String printTime(Date dt) {
+if (dt == null) {
+throw new Fault(new Message("NULL_PASSED_FOR_DATE", LOG));
+}
 Calendar c = Calendar.getInstance();
 c.setTime(dt);
 return DatatypeConverter.printTime(c);
@@ -48,6 +62,9 @@
 return DatatypeConverter.parseDateTime(s).getTime();
 }
 public static String printDateTime(Date dt) {
+if (dt == null) {
+throw new Fault(new Message("NULL_PASSED_FOR_DATE", LOG));
+}
 Calendar c = Calendar.getInstance();
 c.setTime(dt);
 return DatatypeConverter.printDateTime(c);

Modified: 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties?rev=661409&r1=661408&r2=661409&view=diff
==
--- 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
 (original)
+++ 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
 Thu May 29 10:23:34 2008
@@ -30,3 +30,5 @@
 VELOCITY_ENGINE_WRITE_ERRORS = Velocity engine write errors
 FAIL_TO_WRITE_FILE = Failed to write file: {0}
 FAIL_TO_COMPILE_GENERATE_CODES = Failed to compile generated code
+
+NULL_PASSED_FOR_DATE = Null Date passed to DataTypeAdapter
\ No newline at end of file

svn commit: r661413 - in /cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common: DataTypeAdapter.java Messages.properties

[dkulp]

Author: dkulp
Date: Thu May 29 10:30:29 2008
New Revision: 661413

URL: http://svn.apache.org/viewvc?rev=661413&view=rev
Log:
[CXF-1602] Revert last commit as null is actually valid if the date is a 
optional attribute.  Just return null.

Modified:

cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java

cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties

Modified: 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java?rev=661413&r1=661412&r2=661413&view=diff
==
--- 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
 (original)
+++ 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
 Thu May 29 10:30:29 2008
@@ -20,26 +20,23 @@
 
 import java.util.Calendar;
 import java.util.Date;
-import java.util.logging.Logger;
 
 import javax.xml.bind.DatatypeConverter;
 
-import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.interceptor.Fault;
-
 public final class DataTypeAdapter {
-private static final Logger LOG = 
LogUtils.getL7dLogger(DataTypeAdapter.class);
 
 private DataTypeAdapter() {
 }
 
 public static Date parseDate(String s) {
+if (s == null) {
+return null;
+}
 return DatatypeConverter.parseDate(s).getTime();
 }
 public static String printDate(Date dt) {
 if (dt == null) {
-throw new Fault(new Message("NULL_PASSED_FOR_DATE", LOG));
+return null;
 }
 Calendar c = Calendar.getInstance();
 c.setTime(dt);
@@ -47,11 +44,14 @@
 }
 
 public static Date parseTime(String s) {
+if (s == null) {
+return null;
+}
 return DatatypeConverter.parseTime(s).getTime();
 }
 public static String printTime(Date dt) {
 if (dt == null) {
-throw new Fault(new Message("NULL_PASSED_FOR_DATE", LOG));
+return null;
 }
 Calendar c = Calendar.getInstance();
 c.setTime(dt);
@@ -59,11 +59,14 @@
 }
 
 public static Date parseDateTime(String s) {
+if (s == null) {
+return null;
+}
 return DatatypeConverter.parseDateTime(s).getTime();
 }
 public static String printDateTime(Date dt) {
 if (dt == null) {
-throw new Fault(new Message("NULL_PASSED_FOR_DATE", LOG));
+return null;
 }
 Calendar c = Calendar.getInstance();
 c.setTime(dt);

Modified: 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties?rev=661413&r1=661412&r2=661413&view=diff
==
--- 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
 (original)
+++ 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
 Thu May 29 10:30:29 2008
@@ -31,4 +31,3 @@
 FAIL_TO_WRITE_FILE = Failed to write file: {0}
 FAIL_TO_COMPILE_GENERATE_CODES = Failed to compile generated code
 
-NULL_PASSED_FOR_DATE = Null Date passed to DataTypeAdapter
\ No newline at end of file

svn commit: r661415 - in /cxf/branches/2.0.x-fixes: ./ tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java tools/common/src/main/java/org/apache/cxf/tools/common/Messages.prope

[dkulp]

Author: dkulp
Date: Thu May 29 10:32:29 2008
New Revision: 661415

URL: http://svn.apache.org/viewvc?rev=661415&view=rev
Log:
Merged revisions 661409,661413 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk


  r661409 | dkulp | 2008-05-29 13:23:34 -0400 (Thu, 29 May 2008) | 2 lines
  
  [CXF-1602] Add better fault message 

  r661413 | dkulp | 2008-05-29 13:30:29 -0400 (Thu, 29 May 2008) | 2 lines
  
  [CXF-1602] Revert last commit as null is actually valid if the date is a 
optional attribute.  Just return null.


Modified:
cxf/branches/2.0.x-fixes/   (props changed)

cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java

cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties

Propchange: cxf/branches/2.0.x-fixes/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java?rev=661415&r1=661414&r2=661415&view=diff
==
--- 
cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
 Thu May 29 10:32:29 2008
@@ -20,34 +20,54 @@
 
 import java.util.Calendar;
 import java.util.Date;
+
 import javax.xml.bind.DatatypeConverter;
 
 public final class DataTypeAdapter {
+
 private DataTypeAdapter() {
 }
 
 public static Date parseDate(String s) {
+if (s == null) {
+return null;
+}
 return DatatypeConverter.parseDate(s).getTime();
 }
 public static String printDate(Date dt) {
+if (dt == null) {
+return null;
+}
 Calendar c = Calendar.getInstance();
 c.setTime(dt);
 return DatatypeConverter.printDate(c);
 }
 
 public static Date parseTime(String s) {
+if (s == null) {
+return null;
+}
 return DatatypeConverter.parseTime(s).getTime();
 }
 public static String printTime(Date dt) {
+if (dt == null) {
+return null;
+}
 Calendar c = Calendar.getInstance();
 c.setTime(dt);
 return DatatypeConverter.printTime(c);
 }
 
 public static Date parseDateTime(String s) {
+if (s == null) {
+return null;
+}
 return DatatypeConverter.parseDateTime(s).getTime();
 }
 public static String printDateTime(Date dt) {
+if (dt == null) {
+return null;
+}
 Calendar c = Calendar.getInstance();
 c.setTime(dt);
 return DatatypeConverter.printDateTime(c);

Modified: 
cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties?rev=661415&r1=661414&r2=661415&view=diff
==
--- 
cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
 (original)
+++ 
cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
 Thu May 29 10:32:29 2008
@@ -30,3 +30,4 @@
 VELOCITY_ENGINE_WRITE_ERRORS = Velocity engine write errors
 FAIL_TO_WRITE_FILE = Failed to write file: {0}
 FAIL_TO_COMPILE_GENERATE_CODES = Failed to compile generated code
+

svn commit: r661418 - in /cxf/trunk: common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java

[dkulp]

Author: dkulp
Date: Thu May 29 10:44:36 2008
New Revision: 661418

URL: http://svn.apache.org/viewvc?rev=661418&view=rev
Log:
[CXF-1595] Skip over whitespace in logical message

Modified:

cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java

cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java

Modified: 
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=661418&r1=661417&r2=661418&view=diff
==
--- 
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java 
(original)
+++ 
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java 
Thu May 29 10:44:36 2008
@@ -182,6 +182,20 @@
 throw new RuntimeException("Couldn't parse stream.", e);
 }
 }
+public static boolean toNextTag(XMLStreamReader reader) {
+try {
+// advance to first tag.
+int x = reader.getEventType();
+while (x != XMLStreamReader.START_ELEMENT
+&& x != XMLStreamReader.END_ELEMENT
+&& reader.hasNext()) {
+x = reader.next();
+}
+} catch (XMLStreamException e) {
+throw new RuntimeException("Couldn't parse stream.", e);
+}
+return true;
+}
 
 public static boolean toNextTag(DepthXMLStreamReader reader, QName endTag) 
{
 try {

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java?rev=661418&r1=661417&r2=661418&view=diff
==
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
 Thu May 29 10:44:36 2008
@@ -98,6 +98,8 @@
 try {
 W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
 reader = message.getContent(XMLStreamReader.class);
+//content must be an element thing, skip over any 
whitespace
+StaxUtils.toNextTag(reader);
 StaxUtils.copy(reader, writer);
 source = new 
DOMSource(writer.getDocument().getDocumentElement());
 reader = 
StaxUtils.createXMLStreamReader(writer.getDocument());

svn commit: r661443 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java

[dkulp]

Author: dkulp
Date: Thu May 29 12:33:54 2008
New Revision: 661443

URL: http://svn.apache.org/viewvc?rev=661443&view=rev
Log:
[CXF-1598] Grab the qualification for the asm created wrapper beans from the 
schema.

Modified:

cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java?rev=661443&r1=661442&r2=661443&view=diff
==
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
 Thu May 29 12:33:54 2008
@@ -49,6 +49,7 @@
 import org.apache.cxf.service.model.MessageInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassWriter;
@@ -228,12 +229,16 @@
 cw.visit(Opcodes.V1_5, Opcodes.ACC_ABSTRACT + Opcodes.ACC_INTERFACE, 
classFileName, null,
  "java/lang/Object", null);
 
-
+boolean q = qualified;
+SchemaInfo si = interfaceInfo.getService().getSchema(ns);
+if (si != null) {
+q = si.isElementFormQualified();
+}
 AnnotationVisitor av0 = 
cw.visitAnnotation("Ljavax/xml/bind/annotation/XmlSchema;", true);
 av0.visit("namespace", ns);
 av0.visitEnum("elementFormDefault",
   getClassCode(XmlNsForm.class),
-  qualified ? "QUALIFIED" : "UNQUALIFIED");
+  q ? "QUALIFIED" : "UNQUALIFIED");
 av0.visitEnd();
 cw.visitEnd();
 

svn commit: r661447 - /cxf/trunk/bin/jira-report.tmpl

[dkulp]

Author: dkulp
Date: Thu May 29 12:43:40 2008
New Revision: 661447

URL: http://svn.apache.org/viewvc?rev=661447&view=rev
Log:
Add the template that is used for the attachment report

Added:
cxf/trunk/bin/jira-report.tmpl

Added: cxf/trunk/bin/jira-report.tmpl
URL: 
http://svn.apache.org/viewvc/cxf/trunk/bin/jira-report.tmpl?rev=661447&view=auto
==
--- cxf/trunk/bin/jira-report.tmpl (added)
+++ cxf/trunk/bin/jira-report.tmpl Thu May 29 12:43:40 2008
@@ -0,0 +1,61 @@
+set( $void = $params.required( "serverUrl" , "https?://.+", "the base URL 
where jira is available, no trailing slash" ) )
+#set( $void = $params.required( "projectId" , "[0-9]+", "the numeric id the 
project" ) )
+#set( $void = $params.required( "projectName" , ".+", "the display name the 
project" ) )
+#if ( $email == "true" )
+#set( $void = $params.required( "to" , ".+", "the email 'To' address" ) )
+#set( $void = $params.required( "from" , ".+", "the email 'From' address" ) )
+#end
+#set( $void = $params.validate() )
+##
+#set( $url = 
"${serverUrl}/secure/IssueNavigator.jspa?view=rss&&pid=${projectId}&status=1&tempMax=200&reset=true&decorator=none"
 )
+#set( $jirarss = $rss.fetch( $url ) )
+#set( $issues = $jirarss.fillAttachments() )
+#set( $void = $date.format("-MM-dd") )
+##
+#if ( $email == "true" )
+TO: $to
+FROM: $from
+SUBJECT: Issues with Attachments: week of $date
+ 
+#end
+##
+#foreach( $issue in $issues )
+#set( $issue.attributes.totalAttachments = $issue.attachments.size() )
+#end
+#set( $issues = $issues.greater("@totalAttachments", 0).sort("created") )
+ 
+$projectName - $date.as(",  d, ")
+ 
+  $issues.size() Issues with Attachments
+ 
+  (sorted oldest to newest)
+ 
+#if ( $issues.size() < 11 )
+#foreach( $issue in $issues )
+[$issue.key] $issue.summary
+  - Created: $date.format($issue.created)
+  - Type: $issue.type
+  - Fix Versions: $issue.fixVersions
+  - Reporter: $issue.reporter
+  - Attachments: $issue.attachments
+  - $issue.link
+ 
+#end
+#elseif ( $issues.size() < 30 )
+#foreach( $issue in $issues )
+[$issue.key] $issue.summary
+  ($date.format($issue.created) - $issue.type - $issue.reporter)
+  $issue.link
+ 
+#end
+#elseif ( $issues.size() < 50 )
+#foreach( $issue in $issues )
+  $date.format($issue.created) [$issue.key] $issue.summary
+  $issue.link
+ 
+#end
+#else
+#foreach( $issue in $issues )
+  $date.format($issue.created) - $issue.link
+#end
+#end

svn commit: r661456 - /cxf/trunk/bin/jira-report.tmpl

[dkulp]

Author: dkulp
Date: Thu May 29 13:07:57 2008
New Revision: 661456

URL: http://svn.apache.org/viewvc?rev=661456&view=rev
Log:
Only include jiras updated in the last 4 weeks.

Modified:
cxf/trunk/bin/jira-report.tmpl

Modified: cxf/trunk/bin/jira-report.tmpl
URL: 
http://svn.apache.org/viewvc/cxf/trunk/bin/jira-report.tmpl?rev=661456&r1=661455&r2=661456&view=diff
==
--- cxf/trunk/bin/jira-report.tmpl (original)
+++ cxf/trunk/bin/jira-report.tmpl Thu May 29 13:07:57 2008
@@ -1,4 +1,4 @@
-set( $void = $params.required( "serverUrl" , "https?://.+", "the base URL 
where jira is available, no trailing slash" ) )
+#set( $void = $params.required( "serverUrl" , "https?://.+", "the base URL 
where jira is available, no trailing slash" ) )
 #set( $void = $params.required( "projectId" , "[0-9]+", "the numeric id the 
project" ) )
 #set( $void = $params.required( "projectName" , ".+", "the display name the 
project" ) )
 #if ( $email == "true" )
@@ -7,7 +7,7 @@
 #end
 #set( $void = $params.validate() )
 ##
-#set( $url = 
"${serverUrl}/secure/IssueNavigator.jspa?view=rss&&pid=${projectId}&status=1&tempMax=200&reset=true&decorator=none"
 )
+#set( $url = 
"${serverUrl}/secure/IssueNavigator.jspa?view=rss&&pid=${projectId}&status=1&tempMax=500&reset=true&decorator=none&updated%3Aprevious=-4w"
 )
 #set( $jirarss = $rss.fetch( $url ) )
 #set( $issues = $jirarss.fillAttachments() )
 #set( $void = $date.format("-MM-dd") )
@@ -34,9 +34,11 @@
 #foreach( $issue in $issues )
 [$issue.key] $issue.summary
   - Created: $date.format($issue.created)
+  - Updated: $date.format($issue.updated)
   - Type: $issue.type
   - Fix Versions: $issue.fixVersions
   - Reporter: $issue.reporter
+  - Assigned: $issue.assignee
   - Attachments: $issue.attachments
   - $issue.link