cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r573634 [1/3] - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/wsdl/ buildtools/src/main/resources/ distribution/src/main/release/ rt/core/src/main/java/org/apache/cxf/wsdl11/ rt/databinding/aegis/src/main/java/org/apache/cxf/aeg...
Date Fri, 07 Sep 2007 17:18:40 GMT
Author: dkulp
Date: Fri Sep  7 10:18:36 2007
New Revision: 573634

URL: http://svn.apache.org/viewvc?rev=573634&view=rev
Log:
[CXF-972] Patch from Benson applied (and wsdls copied to new java2ws section)
* Update release notes for 2.0.2
* Update supplements for new bad poms
* Fix typos

Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
    incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
    incubator/cxf/trunk/distribution/src/main/release/release_notes.txt
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
    incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_bare.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_async.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_hello_world_doc_lit.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_greeter.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/soap_header.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_bare.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java Fri Sep  7 10:18:36 2007
@@ -123,6 +123,8 @@
     public static final String ATTR_LOCATION = "location";
     public static final String ATTR_NAME = "name";
     public static final String ATTR_TNS = "targetNamespace";
+    // usual prefix for the targetNamespace.
+    public static final String CONVENTIONAL_TNS_PREFIX = "tns";
     
     public static final String WSDL11 = "1.1";
     public static final String WSDL20 = "2.0";

Modified: incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml (original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml Fri Sep  7 10:18:36 2007
@@ -43,9 +43,48 @@
         <name>Sun Microsystems</name>
         <url>http://www.sun.com/</url>
       </organization>
+      <licenses>
+        <license>
+          <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+          <url>http://www.sun.com/cddl/cddl.html</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>javax.xml.soap</groupId>
+      <artifactId>saaj-api</artifactId>
+      <name>Sun SAAJ API</name>
+      <organization>
+        <name>Sun Microsystems</name>
+        <url>http://www.sun.com/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+          <url>http://www.sun.com/cddl/cddl.html</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>org.apache.neethi</groupId>
+      <artifactId>neethi</artifactId>
+      <name>Neethi</name>
+      <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
     </project>
   </supplement>
-
   <supplement>
     <project>
       <groupId>javax.xml.ws</groupId>

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=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/release_notes.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/release_notes.txt Fri Sep  7 10:18:36 2007
@@ -1,17 +1,15 @@
-Apache CXF 2.0.1 (incubating) Release Notes
+Apache CXF 2.0.2 (incubating) Release Notes
 
 1. Overview
 
-Apache CXF 2.0.1, under incubation,  delivers the second milestone of 
+Apache CXF 2.0.2, under incubation,  delivers the second 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.  However, there are some new features as well:
-    * Enable HTTPSession & Session use
-    * Ant tasks for tools
-    * Add support for <databinding> in endpoint & client configuration
-    * Allow access to Jetty Server or at least Context object
-    * Configuring interceptors using annotations
-    * Feature Support for the Bus
+from 2.0.1.  However, there are some new features as well:
+    * WS-Addressing Feature (easier to configure WS-A)
+    * WS-Reliable Messaging Feature (easier to configure WS-RM)
+    * Lots of sample improvements
+    * Several Spring configuration improvements
 
 
 2. Installation Prerequisites 
@@ -70,91 +68,102 @@
 http://issues.apache.org/jira/browse/CXF
 
 6. Specific issues, features, and improvements fixed in the 
-Apache CXF 2.0.1 (incubating) release:
+Apache CXF 2.0.2 (incubating) release:
 
 
 
-Release Notes - CXF - Version 2.0.1
+Release Notes - CXF - Version 2.0.2
+
+** Sub-task
+    * [CXF-901] - Update "WAR" building for full war
+    * [CXF-902] - Add java_first_pojo sample
 
 ** Bug
-    * [CXF-362] - wsdltojava generated code has inconsistent style
-    * [CXF-369] - xsd:dateTime becomes XMLGregorianCalendarImpl when Date needed
-    * [CXF-493] - -b option doesn't work
-    * [CXF-510] - SpringBusFactory only use DEFAULT_BUS_ID to create bus from context
-    * [CXF-527] - JaxwsServiceFactoryBean bugs with RPC style
-    * [CXF-655] - String[] cann't be input paras or return value when use doc/lit of code first way
-    * [CXF-706] - Multiple Http Destinations cannot use the same address when using HTTPS.
-    * [CXF-745] - JAXB Data Binding Generates Duplicate Fault Elements in Generated WSDL
-    * [CXF-747] - Redundant Interceptors in the request-response chain while using Provider API
-    * [CXF-750] - Support using Session in standalone
-    * [CXF-773] - Logical/Soap handlers does not work on the Provider side.
-    * [CXF-777] - velocity engine write errors (NPE)
-    * [CXF-779] - missing jar file(s) in lib directory of 2.0 release or bad wiki page
-    * [CXF-781] - Duplicate type error from Aegis on code that worked fine with XFire 1.2.5
-    * [CXF-782] - wsdl2java generated wrong package name 
-    * [CXF-783] - Ant tasks for tools don't provide helpful error messages
-    * [CXF-784] - Interceptor not setting the fault chain for HTTP Binding
-    * [CXF-785] - Aegis crashes instead of diagnosing namespace error in .aegis.xml file
-    * [CXF-789] - JaxWsServiceConfiguration doesn't correctly find operations with an implementor
-    * [CXF-790] - SOAP headers copied from input SOAPMessage to output SOAPMessage
-    * [CXF-798] - wsdlvalidator cannot validate on-line wsdl
-    * [CXF-800] - Resource matching in jra seems incorrect
-    * [CXF-802] - Java first with unqualified/unannotated JAXB objects don't generate proper soap messages....
-    * [CXF-804] - wsdl2java fails to generate code for the imported wsdl 
-    * [CXF-809] - no cygwin support in java2wsdl script
-    * [CXF-810] - Client and Server classes in  ant script  generated by  wsdl2java are not correct
-    * [CXF-811] - Aegis omits type from WSDL, perhaps particularly when .aegis.xml file is trivial.
-    * [CXF-813] - In java first, JAX-WS is using all methods on the IMPL instead of just the ones on the endpoint interface
-    * [CXF-814] - In java first wrapped/doc/lit, if Impl and Interface have different targetNamespaces, the "parts" are not read
-    * [CXF-818] - Code first, client side, RCP/lit doesn't work without a WSDL
-    * [CXF-819] - WSS4JInterceptors don't allow to have a password callback handler by reference
-    * [CXF-821] - Current CXFservletTransportFactory don't support the conduit Initiator interface
-    * [CXF-824] - SOAPAction can't be used to select an operation
-    * [CXF-839] - Fix misspelling of "prefix"
-    * [CXF-841] - SOAP RPC/Lit uses paramOrder when sending messages instead of the order in the message
-    * [CXF-842] - Code first, RPC/Lit with lots of inouts/outs/headers doesn't work
-    * [CXF-843] - Code first, Multiple out headers is only putting one soap:header element in the wsdl
-    * [CXF-844] - RPC/Lit null value parameters are skipped
-    * [CXF-845] - OneWay operations against JAX-WS RI server don't work
-    * [CXF-846] - MTOM Content-Type header is invalid
-    * [CXF-848] - WSDLValidator not working well with the bundle jar
-    * [CXF-850] - performance of repeated calls to jaxws.Service.createPort is poor, jaxb context is created every time
-    * [CXF-855] - Wsdl2Service not working
+    * [CXF-687] - SOAP over HTTP messages have two Content-Type headers and SOAP action as a separate header
+    * [CXF-849] - SSLUtils logs too much at INFO level
+    * [CXF-869] - jaxws:endpoint, simple:client  not support setting binding element value
+    * [CXF-870] - WebService methods generated from implementation instead of interface
+    * [CXF-874] - Problems with service beans that use AOP
+    * [CXF-882] - @Features and @XXInterceptors doesn't work for client proxies
+    * [CXF-886] - XSD2WSDL Tool seems to be unable to access remote xsdurls
+    * [CXF-897] - Default JAXB Data Binding does not unmarshal parameters correctly for a POJO service
+    * [CXF-898] - Invalid links in Service Listing at root of CXF servlet if the context path does not end in '/'
+    * [CXF-900] - Generated exception classes don't have serialVersionID
+    * [CXF-903] - HTTP binding/REST does not handle Wrapped request correctly
+    * [CXF-904] - Tools output (-help) needs reformatting
+    * [CXF-906] - ClassCastException in CXFServlet.loadSpringBus when context initialization fails
+    * [CXF-910] - maven codegen plugin needs to allow passing arguments for java2wsdl goal
+    * [CXF-911] - java2wsdl goal of the codegen plugin does not throw an exception to stop the maven build on error
+    * [CXF-912] - java2wsdl goal of the codegen plugin turns off all maven output if the 'quiet' tag is set...
+    * [CXF-915] - ASM3.0 dependency affects spring 2.0 functionality
+    * [CXF-916] - Package renaming needed from org.codehaus.xfire -> org.apache.cxf?
+    * [CXF-918] - java code from wsdl2java for wrapped style if request and response have elements with the same names and different datatypes
+    * [CXF-925] - ClassCastException in JAXBEncoderDecoder.unmarshall()
+    * [CXF-926] - JAX-WS code first fault mapping is not writing proper element name on wire if detail has XmlRootElement
+    * [CXF-929] - Https connections recreated for each request
+    * [CXF-934] - Remove redundant configuration in WS-Security unit tests
+    * [CXF-936] - HTTPConduit requires geronimo-mail, cannot use Sun's mail jar
+    * [CXF-937] - Features does not work with a JAX-WS Dispatch Client when defined via spring config.
+    * [CXF-938] - URIMapper did not handle Wrapped/Unwrapped operation correctly when service is in wrapped mode
+    * [CXF-939] - wsdl defining two different operations on the same port using the same messages lead to wsdl2java producing wrong code instead of an error message
+    * [CXF-942] - throwing SOAPFault from IMPL is not correctly mapped on the wire
+    * [CXF-943] - Doc/Lit/Bare creating wrong element names in wsdl
+    * [CXF-944] - Switch URI of BookService test from xfire.codehaus.org to cxf.apache.org
+    * [CXF-946] - AOP with WS Endpoint
+    * [CXF-947] - FaultInfoExceptions don't work when migrating from XFire to CXF
+    * [CXF-950] - CXF WSDL2Java tool doesnt work well for the WCF RPC/Literal wsdl.
+    * [CXF-951] - RCPInInterceptor not adding all the normal attributes to the message
+    * [CXF-953] - In services list, last character in link url is swallowed when no trailing slash is available
+    * [CXF-955] - Implicit dependency from jaxws:endpoint on httpj:engine-factory is not encoded in Spring
+    * [CXF-959] - Incorrect namespace configuration when generating wsdl from Aegis databinding
+    * [CXF-960] - JAX-WS client interfaces that inherit from other interfaces don't map all the operations
+    * [CXF-961] - In tomcat, AuthorizationPolicy object is not found in Message
+    * [CXF-966] - SESSION_MAINTAIN_PROPERTY doesn't track cookies other than JSESSIONID
+    * [CXF-967] - WSDL2Java tool doesnt generate code for empty Input/Output (RPC/Literal)
+    * [CXF-971] - DefinitionParsers don't ignore namespace attributes
+    * [CXF-974] - Jaxws and simple front ends do not support set serviceName and endpointName from spring configuration
+    * [CXF-975] - WS-Policy distribution sample uses outdated cxf policy namespaces
+    * [CXF-978] - WSDL2Java generated code will miss the parameter for wsdl operation has "parameterOrder" attribute.
 
 ** Improvement
-    * [CXF-268] - support <extension> and <extensionArgs> for the cxf-codegen-plugin so that XJC plugins can be used with the wsdl2java tool
-    * [CXF-425] - Insufficient error handling in fault observers
-    * [CXF-744] - Text improvements to error, usage messages for management console
-    * [CXF-746] - Text improvements to frontend Messages.properties files
-    * [CXF-753] - Text improvements
-    * [CXF-757] - Switch to Ant build.xml file for new client_js sample.
-    * [CXF-770] - Fixed messages in messages.properties
-    * [CXF-795] - adding the spring configuration support for the Jetty server
-    * [CXF-805] - wsdl2java error message improvement 
-    * [CXF-817] - Add support for configurable invoker in cxf.xml
-    * [CXF-820] - With Doc/Lit/Wrapped and array/list types, generated wsdl has unreferences array schemas
-    * [CXF-856] - Improvements to messages in Jetty_http transport
+    * [CXF-232] - Unify dispatch/providers with JAX-WS
+    * [CXF-340] - Support adding extra classes to JAXB context
+    * [CXF-488] - Add java2wsdl support for the Maven plugin
+    * [CXF-661] - Jetty Destination not programatically configurable
+    * [CXF-743] - Standardized text in README files for each of the samples.
+    * [CXF-763] - samples improvement
+    * [CXF-871] - Improve message strings in CLI tools
+    * [CXF-887] - messages.properties improvements in org.apache.cxf.jbi.se
+    * [CXF-888] - Control directory for on-disk attachments
+    * [CXF-899] - Missing getFaultInfo() fallback patch - use @WebFault bean as faultInfo if getFaultInfo() is not present
+    * [CXF-928] - wsdl2java should not overwrite existing files
+    * [CXF-930] - XercesImpl.jar needs to be added to CXF_HOME/lib directory
+    * [CXF-931] - UNnecessary library dependency
+    * [CXF-965] - add groovy and ruby script samples
+    * [CXF-972] - Define a tns prefix
 
 ** New Feature
-    * [CXF-749] - Enable HTTPSession & Session use
-    * [CXF-760] - Ant tasks for tools
-    * [CXF-767] - Autogenerate spring ID for <jaxws:endpoint>, <server>, etc
-    * [CXF-768] - Add support for <databinding> in endpoint & client configuration
-    * [CXF-792] - Allow access to Jetty Server or at least Context object
-    * [CXF-803] - Configuring interceptors using annotations
-
+    * [CXF-861] - WS-Reliable Messaging Feature
 
 
 ** Task
-    * [CXF-734] - Changed the print code to assert code in the PolicyTest
-    * [CXF-742] - Add Feature Support for the Bus
+    * [CXF-771] - Upgrade to Neethi 2.0.2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-** Test
-    * [CXF-112] - CXF performance testing and tuning
-    * [CXF-150] - Interop testing with WCF, Axis2
 
-** Wish
-    * [CXF-762] - Can it be available to skip following JAXB error about same name  by user option?
 
 

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java Fri Sep  7 10:18:36 2007
@@ -113,6 +113,7 @@
         if (definition == null) {
             ServiceInfo si = services.get(0);
             definition = newDefinition(si.getName(), si.getTargetNamespace());
+            addNamespace(WSDLConstants.CONVENTIONAL_TNS_PREFIX, si.getTargetNamespace(), definition);
             addExtensibiltyElements(definition, getWSDL11Extensors(si));
 
             Collection<PortType> portTypes = new HashSet<PortType>();
@@ -127,7 +128,7 @@
                     wsdlImport.setNamespaceURI(tns);
                     wsdlImport.setLocationURI(service.getInterface().getName().getLocalPart() + ".wsdl");
                     definition.addImport(wsdlImport);
-                    addNamespace(tns);
+                    addNamespace(getPrefix(tns), tns, definition);
                 }
                 portTypes.add(buildPortType(service.getInterface(), portTypeDef));
                 

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Fri Sep  7 10:18:36 2007
@@ -53,6 +53,7 @@
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.utils.NamespaceMap;
@@ -64,9 +65,9 @@
 import org.jdom.output.DOMOutputter;
 
 /**
- * Handles DataBidning functions for Aegis.
+ * Handles DataBinding functions for Aegis.
  * <p>
- * NOTE: There is an assumed 1:1 mapping between an AegisDatabidning and a Service!
+ * NOTE: There is an assumed 1:1 mapping between an AegisDatabinding and a Service!
  */
 public class AegisDatabinding implements DataBinding {
     
@@ -95,7 +96,7 @@
     @SuppressWarnings("unchecked")
     public <T> DataReader<T> createReader(Class<T> cls) {
         if (cls.equals(XMLStreamReader.class)) {
-            return (DataReader<T>)new XMLStreamDataReader(this);
+            return (DataReader<T>) new XMLStreamDataReader(this);
         } else {
             throw new UnsupportedOperationException();
         }
@@ -262,7 +263,12 @@
         for (Map.Entry<String, Set<Type>> entry : tns2Type.entrySet()) {
             Element e = new Element("schema", "xsd", XmlConstants.XSD);
 
-            e.setAttribute(new Attribute("targetNamespace", entry.getKey()));
+            e.setAttribute(new Attribute(WSDLConstants.ATTR_TNS, entry.getKey()));
+            // Schemas are more readable if there is a specific prefix for the TNS.
+            // note: if aegis ever allows users to ask for a specific prefix in the 
+            // .aegis.xml file, this will need some adjustment in case of conflicts.
+            e.addNamespaceDeclaration(Namespace.getNamespace(WSDLConstants.CONVENTIONAL_TNS_PREFIX, 
+                                                             entry.getKey()));
             e.setAttribute(new Attribute("elementFormDefault", "qualified"));
             e.setAttribute(new Attribute("attributeFormDefault", "qualified"));
 
@@ -278,7 +284,7 @@
                 XmlSchemaCollection col = new XmlSchemaCollection();
                 NamespaceMap nsMap = new NamespaceMap();
                 nsMap.add("xsd", "http://www.w3.org/2001/XMLSchema");
-
+                
                 for (Iterator itr = e.getAdditionalNamespaces().iterator(); itr.hasNext();) {
                     Namespace n = (Namespace) itr.next();
                     nsMap.add(n.getPrefix(), n.getURI());
@@ -294,6 +300,9 @@
                     info.setElement(schema.getDocumentElement());
 
                     XmlSchema xmlSchema = col.read(schema.getDocumentElement());
+                    // Work around bug in JDOM DOMOutputter which fails to correctly
+                    // assign namespaces to attributes. If JDOM worked right, 
+                    // the collection object would get the prefixes for itself.
                     xmlSchema.setNamespaceContext(nsMap);
                     info.setSchema(xmlSchema);
 

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java Fri Sep  7 10:18:36 2007
@@ -68,7 +68,7 @@
         // check for Employee as extension
         String employeeType = types + "xsd:complexType[@name='Employee']";
         assertValid(employeeType, d);
-        String extension = "/xsd:complexContent/xsd:extension[@base='ns1:AbstractUser']";
+        String extension = "/xsd:complexContent/xsd:extension[@base='tns:AbstractUser']";
         assertValid(employeeType + extension, d);
         assertValid(employeeType + extension + "/xsd:sequence/xsd:element[@name='division']", d);
         // assertValid("count(" + employeeType + extension +

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java Fri Sep  7 10:18:36 2007
@@ -66,7 +66,7 @@
         assertValid("//xsd:complexType[@name='getSubmitBean']/xsd:sequence"
                     + "/xsd:element[@name='bleh'][@type='xsd:string'][@minOccurs='0']", doc);
         assertValid("//xsd:complexType[@name='getSubmitBean']/xsd:sequence"
-                    + "/xsd:element[@name='bean'][@type='SimpleBean'][@minOccurs='0']", doc);
+                    + "/xsd:element[@name='bean'][@type='tns:SimpleBean'][@minOccurs='0']", doc);
 
         assertValid("/wsdl:definitions/wsdl:types"
                     + "/xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']", doc);

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java Fri Sep  7 10:18:36 2007
@@ -175,7 +175,7 @@
         createService(CollectionService.class, null);
 
         Document wsdl = getWSDLDocument("CollectionService");
-        assertValid("//xsd:element[@name='return'][@type='ns1:ArrayOfString']", wsdl);
+        assertValid("//xsd:element[@name='return'][@type='tns:ArrayOfString']", wsdl);
     }
 
     @Test
@@ -186,7 +186,7 @@
         // printNode(doc);
         assertValid(
                     "//xsd:complexType[@name='getUnannotatedStringsResponse']"
-                    + "/xsd:sequence/xsd:element[@type='ns1:ArrayOfString']",
+                    + "/xsd:sequence/xsd:element[@type='tns:ArrayOfString']",
                     doc);
     }
 

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java Fri Sep  7 10:18:36 2007
@@ -171,6 +171,7 @@
         schema.getItems().add(el);
 
         NamespaceMap nsMap = new NamespaceMap();
+        nsMap.add(WSDLConstants.CONVENTIONAL_TNS_PREFIX, schema.getTargetNamespace());
         nsMap.add(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NU_SCHEMA_XSD);
         schema.setNamespaceContext(nsMap);
         
@@ -237,6 +238,7 @@
             schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED));
 
             NamespaceMap nsMap = new NamespaceMap();
+            nsMap.add(WSDLConstants.CONVENTIONAL_TNS_PREFIX, schema.getTargetNamespace());
             nsMap.add(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NU_SCHEMA_XSD);
             schema.setNamespaceContext(nsMap);
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java Fri Sep  7 10:18:36 2007
@@ -75,11 +75,11 @@
                     + "/xsd:element[@type='ns0:stringArray']", wsdl);
         
         assertValid("/wsdl:definitions/wsdl:message[@name='sayHi']"
-                    + "/wsdl:part[@element='ns1:sayHi'][@name='sayHi']",
+                    + "/wsdl:part[@element='tns:sayHi'][@name='sayHi']",
                     wsdl);
 
         assertValid("/wsdl:definitions/wsdl:message[@name='getGreetingsResponse']"
-                    + "/wsdl:part[@element='ns1:getGreetingsResponse'][@name='getGreetingsResponse']",
+                    + "/wsdl:part[@element='tns:getGreetingsResponse'][@name='getGreetingsResponse']",
                     wsdl);    
 
         assertValid("/wsdl:definitions/wsdl:binding/wsdl:operation[@name='getGreetings']"
@@ -101,10 +101,10 @@
         assertValid("//wsdl:port/wsdlsoap:address[@location='" + address + "']", wsdl);
         assertValid("//wsdl:portType[@name='Hello']", wsdl);
         assertValid("/wsdl:definitions/wsdl:message[@name='sayHi']"
-                    + "/wsdl:part[@element='ns1:sayHi'][@name='parameters']",
+                    + "/wsdl:part[@element='tns:sayHi'][@name='parameters']",
                     wsdl);
         assertValid("/wsdl:definitions/wsdl:message[@name='sayHiResponse']"
-                    + "/wsdl:part[@element='ns1:sayHiResponse'][@name='result']",
+                    + "/wsdl:part[@element='tns:sayHiResponse'][@name='result']",
                     wsdl);
         assertValid("//xsd:complexType[@name='sayHi']"
                     + "/xsd:sequence/xsd:element[@name='arg0']",

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java Fri Sep  7 10:18:36 2007
@@ -215,22 +215,22 @@
         
 
         assertValid("/wsdl:definitions/wsdl:message[@name='setMessage']" 
-                    + "/wsdl:part[@name = 'parameters'][@element='ns2:setMessage']" , wsdl);
+                    + "/wsdl:part[@name = 'parameters'][@element='ns1:setMessage']" , wsdl);
 
         assertValid("/wsdl:definitions/wsdl:message[@name='echoCharResponse']" 
-                    + "/wsdl:part[@name = 'y'][@element='ns2:charEl_y']" , wsdl);
+                    + "/wsdl:part[@name = 'y'][@element='ns1:charEl_y']" , wsdl);
         
         assertValid("/wsdl:definitions/wsdl:message[@name='echoCharResponse']" 
-                    + "/wsdl:part[@name = 'return'][@element='ns2:charEl_return']" , wsdl);
+                    + "/wsdl:part[@name = 'return'][@element='ns1:charEl_return']" , wsdl);
 
         assertValid("/wsdl:definitions/wsdl:message[@name='echoCharResponse']" 
-                    + "/wsdl:part[@name = 'z'][@element='ns2:charEl_z']" , wsdl);
+                    + "/wsdl:part[@name = 'z'][@element='ns1:charEl_z']" , wsdl);
         
         assertValid("/wsdl:definitions/wsdl:message[@name='echoChar']" 
-                    + "/wsdl:part[@name = 'x'][@element='ns2:charEl_x']" , wsdl);
+                    + "/wsdl:part[@name = 'x'][@element='ns1:charEl_x']" , wsdl);
         
         assertValid("/wsdl:definitions/wsdl:message[@name='echoChar']" 
-                    + "/wsdl:part[@name = 'y'][@element='ns2:charEl_y']" , wsdl);
+                    + "/wsdl:part[@name = 'y'][@element='ns1:charEl_y']" , wsdl);
 
         
     }

Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Fri Sep  7 10:18:36 2007
@@ -424,10 +424,10 @@
                 if (op.hasInput()) { 
                     if (op.getInput().getMessageParts().get(0).getTypeClass() == null) {
                     
-                        QName wraperBeanName = op.getInput().getMessageParts().get(0).getElementQName();
+                        QName wrapperBeanName = op.getInput().getMessageParts().get(0).getElementQName();
                         XmlSchemaElement e = null;
                         for (SchemaInfo s : serviceInfo.getSchemas()) {
-                            e = s.getElementByQName(wraperBeanName);
+                            e = s.getElementByQName(wrapperBeanName);
                             if (e != null) {
                                 op.getInput().getMessageParts().get(0).setXmlSchema(e);
                                 break;
@@ -435,7 +435,7 @@
                         }
                         if (e == null) {
                             createWrappedSchema(serviceInfo, op.getInput(),
-                                                op.getUnwrappedOperation().getInput(), wraperBeanName);
+                                                op.getUnwrappedOperation().getInput(), wrapperBeanName);
                         }
                     }
 
@@ -455,17 +455,17 @@
                 if (op.hasOutput()) {
                     if (op.getOutput().getMessageParts().get(0).getTypeClass() == null) {
                     
-                        QName wraperBeanName = op.getOutput().getMessageParts().get(0).getElementQName();
+                        QName wrapperBeanName = op.getOutput().getMessageParts().get(0).getElementQName();
                         XmlSchemaElement e = null;
                         for (SchemaInfo s : serviceInfo.getSchemas()) {
-                            e = s.getElementByQName(wraperBeanName);
+                            e = s.getElementByQName(wrapperBeanName);
                             if (e != null) {
                                 break;
                             }
                         }
                         if (e == null) {
                             createWrappedSchema(serviceInfo, op.getOutput(), op.getUnwrappedOperation()
-                                .getOutput(), wraperBeanName);
+                                .getOutput(), wrapperBeanName);
                         }
                     }
                     for (MessagePartInfo mpi : op.getOutput().getMessageParts()) {
@@ -515,13 +515,13 @@
     }
 
     protected void createWrappedSchema(ServiceInfo serviceInfo, AbstractMessageContainer wrappedMessage,
-                                       AbstractMessageContainer unwrappedMessage, QName wraperBeanName) {
+                                       AbstractMessageContainer unwrappedMessage, QName wrapperBeanName) {
         SchemaInfo schemaInfo = getOrCreateSchema(serviceInfo,
-                                                  wraperBeanName.getNamespaceURI(),
+                                                  wrapperBeanName.getNamespaceURI(),
                                                   qualifyWrapperSchema());
 
         createWrappedMessageSchema(serviceInfo, wrappedMessage, unwrappedMessage,
-                                   schemaInfo.getSchema(), wraperBeanName);
+                                   schemaInfo.getSchema(), wrapperBeanName);
     }
 
     protected void createBareMessage(ServiceInfo serviceInfo,
@@ -754,6 +754,7 @@
 
         NamespaceMap nsMap = new NamespaceMap();
         nsMap.add(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NU_SCHEMA_XSD);
+        nsMap.add(WSDLConstants.CONVENTIONAL_TNS_PREFIX, serviceInfo.getTargetNamespace());
         schema.setNamespaceContext(nsMap);
         serviceInfo.addSchema(schemaInfo);
         return schemaInfo;

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl Fri Sep  7 10:18:36 2007
@@ -17,23 +17,23 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions name="Calculator" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:ns1="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="Calculator" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:tns="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/">
-<xsd:element name="AddException" type="AddException"/>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/">
+<xsd:element name="AddException" type="tns:AddException"/>
 <xsd:complexType name="AddException">
 <xsd:sequence>
 <xsd:element name="message" nillable="true" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-<xsd:element name="add" type="add"/>
+<xsd:element name="add" type="tns:add"/>
 <xsd:complexType name="add">
 <xsd:sequence>
 <xsd:element name="a" type="xsd:int"/>
 <xsd:element name="b" type="xsd:int"/>
 </xsd:sequence>
 </xsd:complexType>
-<xsd:element name="addResponse" type="addResponse"/>
+<xsd:element name="addResponse" type="tns:addResponse"/>
 <xsd:complexType name="addResponse">
 <xsd:sequence>
 <xsd:element name="return" type="xsd:int"/>
@@ -42,28 +42,28 @@
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="add">
-    <wsdl:part name="parameters" element="ns1:add">
+    <wsdl:part name="parameters" element="tns:add">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="addResponse">
-    <wsdl:part name="result" element="ns1:addResponse">
+    <wsdl:part name="result" element="tns:addResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="AddException">
-    <wsdl:part name="fault" element="ns1:AddException">
+    <wsdl:part name="fault" element="tns:AddException">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="CalculatorPortType">
     <wsdl:operation name="add">
-      <wsdl:input name="add" message="ns1:add">
+      <wsdl:input name="add" message="tns:add">
     </wsdl:input>
-      <wsdl:output name="addResponse" message="ns1:addResponse">
+      <wsdl:output name="addResponse" message="tns:addResponse">
     </wsdl:output>
-      <wsdl:fault name="AddException" message="ns1:AddException">
+      <wsdl:fault name="AddException" message="tns:AddException">
     </wsdl:fault>
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="CalculatorSoapBinding" type="ns1:CalculatorPortType">
+  <wsdl:binding name="CalculatorSoapBinding" type="tns:CalculatorPortType">
     <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="add">
       <soap:operation soapAction="" style="document"/>
@@ -79,7 +79,7 @@
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="Calculator">
-    <wsdl:port name="CalculatorPort" binding="ns1:CalculatorSoapBinding">
+    <wsdl:port name="CalculatorPort" binding="tns:CalculatorSoapBinding">
       <soap:address location="http://localhost:9090/hello"/>
     </wsdl:port>
   </wsdl:service>

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl Fri Sep  7 10:18:36 2007
@@ -7,9 +7,9 @@
   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
@@ -17,8 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
-<wsdl:definitions name="Database" targetNamespace="http://cxf523.fortest.tools.cxf.apache.org/" xmlns:ns1="http://cxf523.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="Database" targetNamespace="http://cxf523.fortest.tools.cxf.apache.org/" xmlns:tns="http://cxf523.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf523.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf523.fortest.tools.cxf.apache.org/">
 <xs:complexType name="operation0ResponseType">
@@ -50,28 +49,28 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="operation0">
-    <wsdl:part name="parameters" element="ns1:operation0">
+    <wsdl:part name="parameters" element="tns:operation0">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="DBServiceFault">
-    <wsdl:part name="fault" element="ns1:DBServiceFault">
+    <wsdl:part name="fault" element="tns:DBServiceFault">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="operation0Response">
-    <wsdl:part name="result" element="ns1:operation0Response">
+    <wsdl:part name="result" element="tns:operation0Response">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="DatabasePortType">
     <wsdl:operation name="operation0">
-      <wsdl:input name="operation0" message="ns1:operation0">
+      <wsdl:input name="operation0" message="tns:operation0">
     </wsdl:input>
-      <wsdl:output name="operation0Response" message="ns1:operation0Response">
+      <wsdl:output name="operation0Response" message="tns:operation0Response">
     </wsdl:output>
-      <wsdl:fault name="DBServiceFault" message="ns1:DBServiceFault">
+      <wsdl:fault name="DBServiceFault" message="tns:DBServiceFault">
     </wsdl:fault>
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="DatabaseSoapBinding" type="ns1:DatabasePortType">
+  <wsdl:binding name="DatabaseSoapBinding" type="tns:DatabasePortType">
     <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="operation0">
       <soap:operation soapAction="" style="document"/>
@@ -87,7 +86,7 @@
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="Database">
-    <wsdl:port name="DatabasePort" binding="ns1:DatabaseSoapBinding">
+    <wsdl:port name="DatabasePort" binding="tns:DatabaseSoapBinding">
       <soap:address location="http://localhost:9090/hello"/>
     </wsdl:port>
   </wsdl:service>

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl Fri Sep  7 10:18:36 2007
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/hello_world_soap12_http" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://apache.org/hello_world_soap12_http" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_soap12_http/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/hello_world_soap12_http" xmlns:tns="http://apache.org/hello_world_soap12_http" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://apache.org/hello_world_soap12_http/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/hello_world_soap12_http/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/hello_world_soap12_http/types">
 <xs:element name="faultDetail">
@@ -47,42 +47,42 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="sayHi">
-    <wsdl:part name="parameters" element="ns2:sayHi">
+    <wsdl:part name="parameters" element="ns1:sayHi">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="result" element="ns2:sayHiResponse">
+    <wsdl:part name="result" element="ns1:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="PingMeFault">
-    <wsdl:part name="fault" element="ns2:faultDetail">
+    <wsdl:part name="fault" element="ns1:faultDetail">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMeResponse">
-    <wsdl:part name="result" element="ns2:pingMeResponse">
+    <wsdl:part name="result" element="ns1:pingMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMe">
-    <wsdl:part name="parameters" element="ns2:pingMe">
+    <wsdl:part name="parameters" element="ns1:pingMe">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Greeter">
     <wsdl:operation name="sayHi">
-      <wsdl:input name="sayHi" message="ns1:sayHi">
+      <wsdl:input name="sayHi" message="tns:sayHi">
     </wsdl:input>
-      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+      <wsdl:output name="sayHiResponse" message="tns:sayHiResponse">
     </wsdl:output>
     </wsdl:operation>
     <wsdl:operation name="pingMe">
-      <wsdl:input name="pingMe" message="ns1:pingMe">
+      <wsdl:input name="pingMe" message="tns:pingMe">
     </wsdl:input>
-      <wsdl:output name="pingMeResponse" message="ns1:pingMeResponse">
+      <wsdl:output name="pingMeResponse" message="tns:pingMeResponse">
     </wsdl:output>
-      <wsdl:fault name="PingMeFault" message="ns1:PingMeFault">
+      <wsdl:fault name="PingMeFault" message="tns:PingMeFault">
     </wsdl:fault>
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
+  <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter">
     <soap12:binding style="document" transport="http://www.w3.org/2003/05/soap/bindings/HTTP/"/>
     <wsdl:operation name="sayHi">
       <soap12:operation soapAction="" style="document"/>
@@ -107,7 +107,7 @@
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="GreeterService">
-    <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
+    <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
       <soap12:address location="http://localhost:9090/hello"/>
     </wsdl:port>
   </wsdl:service>

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl Fri Sep  7 10:18:36 2007
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-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.
+  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.
 -->
-<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/fault" xmlns:ns1="http://apache.org/fault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/fault/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/fault" xmlns:tns="http://apache.org/fault" xmlns:ns1="http://apache.org/fault/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/fault/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/fault/types">
 <xs:element name="BadRecordLit" nillable="true" type="xs:string"/>
@@ -67,50 +67,50 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="BadRecordLitFault">
-    <wsdl:part name="fault" element="ns2:BadRecordLit">
+    <wsdl:part name="fault" element="ns1:BadRecordLit">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="NoSuchCodeLitFault">
+    <wsdl:part name="fault" element="ns1:NoSuchCodeLit">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="testDocLitFault">
-    <wsdl:part name="parameters" element="ns2:testDocLitFault">
+    <wsdl:part name="parameters" element="ns1:testDocLitFault">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMeResponse">
-    <wsdl:part name="result" element="ns2:greetMeResponse">
+    <wsdl:part name="result" element="ns1:greetMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="testDocLitFaultResponse">
-    <wsdl:part name="result" element="ns2:testDocLitFaultResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="NoSuchCodeLitFault">
-    <wsdl:part name="fault" element="ns2:NoSuchCodeLit">
+    <wsdl:part name="result" element="ns1:testDocLitFaultResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMe">
-    <wsdl:part name="parameters" element="ns2:greetMe">
+    <wsdl:part name="parameters" element="ns1:greetMe">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Greeter">
     <wsdl:operation name="greetMe">
-      <wsdl:input name="greetMe" message="ns1:greetMe">
+      <wsdl:input name="greetMe" message="tns:greetMe">
     </wsdl:input>
-      <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
+      <wsdl:output name="greetMeResponse" message="tns:greetMeResponse">
     </wsdl:output>
-      <wsdl:fault name="NoSuchCodeLitFault" message="ns1:NoSuchCodeLitFault">
+      <wsdl:fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault">
     </wsdl:fault>
     </wsdl:operation>
     <wsdl:operation name="testDocLitFault">
-      <wsdl:input name="testDocLitFault" message="ns1:testDocLitFault">
+      <wsdl:input name="testDocLitFault" message="tns:testDocLitFault">
     </wsdl:input>
-      <wsdl:output name="testDocLitFaultResponse" message="ns1:testDocLitFaultResponse">
+      <wsdl:output name="testDocLitFaultResponse" message="tns:testDocLitFaultResponse">
     </wsdl:output>
-      <wsdl:fault name="NoSuchCodeLitFault" message="ns1:NoSuchCodeLitFault">
+      <wsdl:fault name="BadRecordLitFault" message="tns:BadRecordLitFault">
     </wsdl:fault>
-      <wsdl:fault name="BadRecordLitFault" message="ns1:BadRecordLitFault">
+      <wsdl:fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault">
     </wsdl:fault>
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
+  <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter">
     <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="greetMe">
       <soap:operation soapAction="" style="document"/>
@@ -132,16 +132,16 @@
       <wsdl:output name="testDocLitFaultResponse">
         <soap:body use="literal"/>
       </wsdl:output>
-      <wsdl:fault name="NoSuchCodeLitFault">
-        <soap:fault name="NoSuchCodeLitFault" use="literal"/>
-      </wsdl:fault>
       <wsdl:fault name="BadRecordLitFault">
         <soap:fault name="BadRecordLitFault" use="literal"/>
       </wsdl:fault>
+      <wsdl:fault name="NoSuchCodeLitFault">
+        <soap:fault name="NoSuchCodeLitFault" use="literal"/>
+      </wsdl:fault>
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="GreeterService">
-    <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
+    <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
       <soap:address location="http://localhost:9090/hello"/>
     </wsdl:port>
   </wsdl:service>

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl Fri Sep  7 10:18:36 2007
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-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.
+  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.
 -->
-<wsdl:definitions name="SOAPService" targetNamespace="http://cxf.apache/" xmlns:ns1="http://cxf.apache/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="SOAPService" targetNamespace="http://cxf.apache/" xmlns:tns="http://cxf.apache/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache/">
-<xsd:element name="sayHi" type="sayHi"/>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf.apache/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache/">
+<xsd:element name="sayHi" type="tns:sayHi"/>
 <xsd:complexType name="sayHi">
 <xsd:sequence>
 <xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
 </xsd:sequence>
 </xsd:complexType>
-<xsd:element name="sayHiResponse" type="sayHiResponse"/>
+<xsd:element name="sayHiResponse" type="tns:sayHiResponse"/>
 <xsd:complexType name="sayHiResponse">
 <xsd:sequence>
 <xsd:element maxOccurs="unbounded" minOccurs="0" name="return" type="xsd:anyType"/>
@@ -35,22 +35,22 @@
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="result" element="ns1:sayHiResponse">
+    <wsdl:part name="result" element="tns:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHi">
-    <wsdl:part name="parameters" element="ns1:sayHi">
+    <wsdl:part name="parameters" element="tns:sayHi">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="ListTest">
     <wsdl:operation name="sayHi">
-      <wsdl:input name="sayHi" message="ns1:sayHi">
+      <wsdl:input name="sayHi" message="tns:sayHi">
     </wsdl:input>
-      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+      <wsdl:output name="sayHiResponse" message="tns:sayHiResponse">
     </wsdl:output>
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="SOAPServiceSoapBinding" type="ns1:ListTest">
+  <wsdl:binding name="SOAPServiceSoapBinding" type="tns:ListTest">
     <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="sayHi">
       <soap:operation soapAction="" style="document"/>
@@ -63,7 +63,7 @@
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="SOAPService">
-    <wsdl:port name="SoapPort" binding="ns1:SOAPServiceSoapBinding">
+    <wsdl:port name="SoapPort" binding="tns:SOAPServiceSoapBinding">
       <soap:address location="http://localhost:9090/hello"/>
     </wsdl:port>
   </wsdl:service>

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl Fri Sep  7 10:18:36 2007
@@ -1,4 +1,4 @@
-<?xml  version="1.0"  encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file
@@ -7,9 +7,9 @@
   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
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions name="MyService" targetNamespace="http://apache.org/hello_world_soap12_http" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://apache.org/hello_world_soap12_http" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_soap12_http/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="MyService" targetNamespace="http://apache.org/hello_world_soap12_http" xmlns:tns="http://apache.org/hello_world_soap12_http" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://apache.org/hello_world_soap12_http/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/hello_world_soap12_http/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/hello_world_soap12_http/types">
 <xs:element name="faultDetail">
@@ -47,42 +47,42 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="sayHi">
-    <wsdl:part name="parameters" element="ns2:sayHi">
+    <wsdl:part name="parameters" element="ns1:sayHi">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="result" element="ns2:sayHiResponse">
+    <wsdl:part name="result" element="ns1:sayHiResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="PingMeFault">
-    <wsdl:part name="fault" element="ns2:faultDetail">
+    <wsdl:part name="fault" element="ns1:faultDetail">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMeResponse">
-    <wsdl:part name="result" element="ns2:pingMeResponse">
+    <wsdl:part name="result" element="ns1:pingMeResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="pingMe">
-    <wsdl:part name="parameters" element="ns2:pingMe">
+    <wsdl:part name="parameters" element="ns1:pingMe">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Greeter">
     <wsdl:operation name="sayHi">
-      <wsdl:input name="sayHi" message="ns1:sayHi">
+      <wsdl:input name="sayHi" message="tns:sayHi">
     </wsdl:input>
-      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+      <wsdl:output name="sayHiResponse" message="tns:sayHiResponse">
     </wsdl:output>
     </wsdl:operation>
     <wsdl:operation name="pingMe">
-      <wsdl:input name="pingMe" message="ns1:pingMe">
+      <wsdl:input name="pingMe" message="tns:pingMe">
     </wsdl:input>
-      <wsdl:output name="pingMeResponse" message="ns1:pingMeResponse">
+      <wsdl:output name="pingMeResponse" message="tns:pingMeResponse">
     </wsdl:output>
-      <wsdl:fault name="PingMeFault" message="ns1:PingMeFault">
+      <wsdl:fault name="PingMeFault" message="tns:PingMeFault">
     </wsdl:fault>
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
+  <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter">
     <soap12:binding style="document" transport="http://www.w3.org/2003/05/soap/bindings/HTTP/"/>
     <wsdl:operation name="sayHi">
       <soap12:operation soapAction="" style="document"/>
@@ -107,7 +107,7 @@
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="MyService">
-    <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
+    <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
       <soap12:address location="http://localhost:9090/hello"/>
     </wsdl:port>
   </wsdl:service>

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl Fri Sep  7 10:18:36 2007
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions name="RPCHelloService" targetNamespace="http://cxf.apache.org/rpc" xmlns:ns1="http://cxf.apache.org/rpc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="RPCHelloService" targetNamespace="http://cxf.apache.org/rpc" xmlns:tns="http://cxf.apache.org/rpc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:message name="helloResponse">
     <wsdl:part name="return" type="xsd:string">
     </wsdl:part>
@@ -28,13 +28,13 @@
   </wsdl:message>
   <wsdl:portType name="RPCHello">
     <wsdl:operation name="hello">
-      <wsdl:input name="hello" message="ns1:hello">
+      <wsdl:input name="hello" message="tns:hello">
     </wsdl:input>
-      <wsdl:output name="helloResponse" message="ns1:helloResponse">
+      <wsdl:output name="helloResponse" message="tns:helloResponse">
     </wsdl:output>
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="RPCHelloServiceSoapBinding" type="ns1:RPCHello">
+  <wsdl:binding name="RPCHelloServiceSoapBinding" type="tns:RPCHello">
     <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="hello">
       <soap:operation soapAction="" style="rpc"/>
@@ -47,7 +47,7 @@
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="RPCHelloService">
-    <wsdl:port name="RPCHelloPort" binding="ns1:RPCHelloServiceSoapBinding">
+    <wsdl:port name="RPCHelloPort" binding="tns:RPCHelloServiceSoapBinding">
       <soap:address location="http://localhost:9090/hello"/>
     </wsdl:port>
   </wsdl:service>

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl Fri Sep  7 10:18:36 2007
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/xml_bare" xmlns:ns1="http://apache.org/xml_bare" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/xml_bare/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/xml_bare" xmlns:tns="http://apache.org/xml_bare" xmlns:ns1="http://apache.org/xml_bare/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/xml_bare/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/xml_bare/types">
 <xs:element name="myComplexStruct" nillable="true" type="tns:myComplexStructType"/>
@@ -31,71 +31,71 @@
 </xs:sequence>
 </xs:complexType>
 </xs:schema>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://apache.org/xml_bare" xmlns:ns0="http://apache.org/xml_bare/types" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://apache.org/xml_bare">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://apache.org/xml_bare/types" xmlns:tns="http://apache.org/xml_bare" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://apache.org/xml_bare">
 <xsd:import namespace="http://apache.org/xml_bare/types"/>
 <xsd:element name="out" nillable="true" type="xsd:string"/>
 <xsd:element name="in" nillable="true" type="ns0:myComplexStructType"/>
 </xsd:schema>
   </wsdl:types>
   <wsdl:message name="sendReceiveData">
-    <wsdl:part name="in" element="ns1:in">
+    <wsdl:part name="in" element="tns:in">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="testMultiParamPart">
-    <wsdl:part name="in2" element="ns2:myComplexStruct">
+    <wsdl:part name="in2" element="ns1:myComplexStruct">
     </wsdl:part>
-    <wsdl:part name="in1" element="ns2:requestType">
+    <wsdl:part name="in1" element="ns1:requestType">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="greetMe">
-    <wsdl:part name="me" element="ns2:requestType">
+    <wsdl:part name="me" element="ns1:requestType">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHiResponse">
-    <wsdl:part name="out" element="ns1:out">
+    <wsdl:part name="out" element="tns:out">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sendReceiveDataResponse">
-    <wsdl:part name="out" element="ns1:out">
+    <wsdl:part name="out" element="tns:out">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="testMultiParamPartResponse">
-    <wsdl:part name="out1" element="ns2:responseType">
+    <wsdl:part name="out1" element="ns1:responseType">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="sayHi">
   </wsdl:message>
   <wsdl:message name="greetMeResponse">
-    <wsdl:part name="theResponse" element="ns2:responseType">
+    <wsdl:part name="theResponse" element="ns1:responseType">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Greeter">
     <wsdl:operation name="sayHi">
-      <wsdl:input name="sayHi" message="ns1:sayHi">
+      <wsdl:input name="sayHi" message="tns:sayHi">
     </wsdl:input>
-      <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+      <wsdl:output name="sayHiResponse" message="tns:sayHiResponse">
     </wsdl:output>
     </wsdl:operation>
     <wsdl:operation name="testMultiParamPart">
-      <wsdl:input name="testMultiParamPart" message="ns1:testMultiParamPart">
+      <wsdl:input name="testMultiParamPart" message="tns:testMultiParamPart">
     </wsdl:input>
-      <wsdl:output name="testMultiParamPartResponse" message="ns1:testMultiParamPartResponse">
+      <wsdl:output name="testMultiParamPartResponse" message="tns:testMultiParamPartResponse">
     </wsdl:output>
     </wsdl:operation>
     <wsdl:operation name="greetMe">
-      <wsdl:input name="greetMe" message="ns1:greetMe">
+      <wsdl:input name="greetMe" message="tns:greetMe">
     </wsdl:input>
-      <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
+      <wsdl:output name="greetMeResponse" message="tns:greetMeResponse">
     </wsdl:output>
     </wsdl:operation>
     <wsdl:operation name="sendReceiveData">
-      <wsdl:input name="sendReceiveData" message="ns1:sendReceiveData">
+      <wsdl:input name="sendReceiveData" message="tns:sendReceiveData">
     </wsdl:input>
-      <wsdl:output name="sendReceiveDataResponse" message="ns1:sendReceiveDataResponse">
+      <wsdl:output name="sendReceiveDataResponse" message="tns:sendReceiveDataResponse">
     </wsdl:output>
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
+  <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter">
     <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="sayHi">
       <soap:operation soapAction="" style="document"/>
@@ -135,7 +135,7 @@
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="GreeterService">
-    <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
+    <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
       <soap:address location="http://localhost:9090/hello"/>
     </wsdl:port>
   </wsdl:service>

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl?rev=573634&r1=573633&r2=573634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl Fri Sep  7 10:18:36 2007
@@ -1,23 +1,5 @@
-<!--
-  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.
--->
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="StockService" targetNamespace="http://doc.withannotation.fortest.tools.cxf.apache.org/" xmlns:ns1="http://doc.withannotation.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="StockService" targetNamespace="http://doc.withannotation.fortest.tools.cxf.apache.org/" xmlns:tns="http://doc.withannotation.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://doc.withannotation.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://doc.withannotation.fortest.tools.cxf.apache.org/">
 <xs:element name="getPrice">
@@ -37,22 +19,22 @@
 </xs:schema>
   </wsdl:types>
   <wsdl:message name="getPriceResponse">
-    <wsdl:part name="result" element="ns1:getPriceResponse">
+    <wsdl:part name="result" element="tns:getPriceResponse">
     </wsdl:part>
   </wsdl:message>
   <wsdl:message name="getPrice">
-    <wsdl:part name="parameters" element="ns1:getPrice">
+    <wsdl:part name="parameters" element="tns:getPrice">
     </wsdl:part>
   </wsdl:message>
   <wsdl:portType name="Stock">
     <wsdl:operation name="getPrice">
-      <wsdl:input name="getPrice" message="ns1:getPrice">
+      <wsdl:input name="getPrice" message="tns:getPrice">
     </wsdl:input>
-      <wsdl:output name="getPriceResponse" message="ns1:getPriceResponse">
+      <wsdl:output name="getPriceResponse" message="tns:getPriceResponse">
     </wsdl:output>
     </wsdl:operation>
   </wsdl:portType>
-  <wsdl:binding name="StockServiceSoapBinding" type="ns1:Stock">
+  <wsdl:binding name="StockServiceSoapBinding" type="tns:Stock">
     <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="getPrice">
       <soap:operation soapAction="" style="document"/>
@@ -65,7 +47,7 @@
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="StockService">
-    <wsdl:port name="StockPort" binding="ns1:StockServiceSoapBinding">
+    <wsdl:port name="StockPort" binding="tns:StockServiceSoapBinding">
       <soap:address location="http://localhost:9090"/>
     </wsdl:port>
   </wsdl:service>



Mime
View raw message