You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/01/21 21:51:32 UTC

svn commit: r614005 - in /incubator/cxf/branches/2.0.x-fixes: ./ distribution/src/main/release/ rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ systests/src/test/ja...

Author: dkulp
Date: Mon Jan 21 12:51:29 2008
New Revision: 614005

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

........
  r614001 | dkulp | 2008-01-21 15:32:23 -0500 (Mon, 21 Jan 2008) | 3 lines
  
  [CXF-1226] Honor qualification from package-info
  Add apache header to a bunch of things
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayW3C.xml
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/beans.xml
    incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/resources/anytype.wsdl
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/wsdl_addr.wsdl

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/release_notes.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt?rev=614005&r1=614004&r2=614005&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 Mon Jan 21 12:51:29 2008
@@ -2,10 +2,10 @@
 
 1. Overview
 
-Apache CXF 2.0.3, under incubation,  delivers the third milestone of 
+Apache CXF 2.0.4, under incubation,  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.2 fixing 82 JIRA issues.
+from 2.0.3 fixing 82 JIRA issues.
 
 
 2. Installation Prerequisites 
@@ -75,105 +75,66 @@
 http://issues.apache.org/jira/browse/CXF
 
 6. Specific issues, features, and improvements fixed in the 
-Apache CXF 2.0.3 (incubating) release:
+Apache CXF 2.0.4 (incubating) release:
 
-** Sub-task
-    * [CXF-987] - Aegis schema does not match the actual situation
-    * [CXF-1037] - ClassCastException writing a Map<Long, someclass> in a reply message with Aegis
-    * [CXF-1043] - Presence of .aegis.xml file disrupts java5 generic processing for return Maps
-    * [CXF-1044] - Make JCA get Connection without providing wsdl.
-    * [CXF-1045] - JCA outbound codes refactoring.
-    * [CXF-1047] - Write EJBInvoker to publish the EJB servant.
-    * [CXF-1063] - Refactor the jca/hello_world_soap_http sample.
-    * [CXF-1082] - Improve the Log in jca module.
-    * [CXF-1093] - create the polling thread by using WorkManager
-    * [CXF-1130] - Add the weblogic specfic file in deploying RAR.
-    * [CXF-1147] - Refactoring the jca handler chain building.
 
 ** Bug
-    * [CXF-917] - org.apache.cxf.systest.handlers.DispatchHandlerInvocationTest failure
-    * [CXF-919] - cxf-codgen-plugin needs to depend on cxf-rt-bindings-soap
-    * [CXF-922] - HTTP Conduit configuration is not loaded
-    * [CXF-948] - NullPointerException when ?wsdl url contains extra parameters
-    * [CXF-982] - Eclipse settings don't match checkstyle settings
-    * [CXF-986] - Cached file was deleted, java.io.FileNotFoundException in SWA with Logging on.
-    * [CXF-992] - If a null parameter is passed using the ClientProxyFactoryBean, all subsequent parameters become null
-    * [CXF-996] - WSDL2Java validate error for doc/lit bare wsdl.
-    * [CXF-1021] - Map entries not reconstructed on other side of WS call due to namespace mismatch (see Xfire Bug: XFIRE-842)
-    * [CXF-1029] - The given example is not correct!
-    * [CXF-1032] - @WebMethod (exclude = true)  are not being excluded
-    * [CXF-1053] - Catalog entry in codegen maven plugin and command line ignored.
-    * [CXF-1059] - CachedOutputStream closes streams prematurely
-    * [CXF-1060] - Code depends on spring bean initialization order
-    * [CXF-1062] - Bug in EndpointImpl#stop()
-    * [CXF-1071] - url re-writing for xsd imported into xsd not working with catalogs set.
-    * [CXF-1077] - system test DispatchHandlerInvocationTest failed
-    * [CXF-1080] - Aegis + JAX-WS fails to throw specific exceptions
-    * [CXF-1083] - LogUtils is missing some MissingResourceException handling
-    * [CXF-1086] - Noise log traffic due to lifecycle management problem with jetty server
-    * [CXF-1092] - Aegis+Jaxws ignores namespaces on @WebParams
-    * [CXF-1095] - The binding file does not take effect for imported wsdl 
-    * [CXF-1096] - Resources not being loaded correctly for tls
-    * [CXF-1097] - JMS transport cannot handle messages > 64K
-    * [CXF-1103] - Schema imports missing from cross-tns embedded schemata
-    * [CXF-1105] - Arrays with Aegis+JAX-WS produce incorrect WSDL
-    * [CXF-1106] - XPATH result  in jaxws customization  is not NodeList
-    * [CXF-1107] - Local transport direct dispatch mode can't work
-    * [CXF-1108] - CXF AbstractEndpointFactory 's setServiceName and setEndpointName do not take effect
-    * [CXF-1110] - Adding DefaultHandler to handler list for jetty disables all service endpoints.
-    * [CXF-1115] - SOAP w/ Attachments does not work with Dispatch/Provider based services
-    * [CXF-1116] - 1-dimentional arrays appear as 2-dimentional in the wsdl
-    * [CXF-1118] - JAXB serialized private fields of faults
-    * [CXF-1120] - Server lifecycle management problems, perhaps
-    * [CXF-1121] - jaxb binding fails for property getters marked @XmlTransient if they return an array with component type that is an interface
-    * [CXF-1122] - DynamicClientFactory xsd:any sub-element No DynamicClientFactory: no compiled schema element could be found ....
-    * [CXF-1123] - ClientFaultConverter needs to deal with unqualified part names.
-    * [CXF-1124] - Does not honor localName in RequestWrapper/ResponseWrapper annotations.
-    * [CXF-1127] - JAXB Data Binding Generates Duplicate Fault Elements in Generated WSDL
-    * [CXF-1129] - org.apache.cxf.interceptor.Fault: Index: 1, Size: 1
-    * [CXF-1131] - JAX-WS + JAXB problem - javax.xml.ws.soap.SOAPFaultException thrown instead of custom exception
-    * [CXF-1136] - Custom exception not appearing in SOAP fault response
-    * [CXF-1137] - CXF wsdl2java NPE's if it cannot find the wsdl:portType identified by a wsdl:binding
-    * [CXF-1139] - Sample wsdl_first_xml_pure build failure
-    * [CXF-1140] - wsdl2java failed if the schema import use the relative path to a url
-    * [CXF-1141] - wsdl2java failed to generate code when use the following jaxb binding file 
-    * [CXF-1145] - Not able to set the namespace for a service wsdl
-    * [CXF-1146] - wsdl2java validator incorrectly requiring doc/lit soap:body messages to have namespaces
-    * [CXF-1149] - Error thrown with Schema validation enabled when using xml-catalogs
-    * [CXF-1150] - EndpointReferenceUtils cannot obtain schema for client
-    * [CXF-1152] - wsdl2java can not process two jaxws binding files at the same time
-    * [CXF-1153] - wsdlvalidator failed with recursive wsdl
-    * [CXF-1154] - wsdlvalidator failed with imported wsdl
-    * [CXF-1168] - Dynamic client horks when asked to process a schema using base64
-    * [CXF-1169] - wsdl2java from maven-code-gen plugin has validation and no warning suppression - wsdl with no service blows with error warning ...
+    * [CXF-865] - CXF http-jetty transport do not call the jetty server engine shutdown when the server stop
+    * [CXF-941] - Dispatch invokeOneWay is trying to parse responses
+    * [CXF-1054] - Aegis issues with maps
+    * [CXF-1180] - If Exchange is the last parameter on the method parameter list of a JAX-WS operation, then CXF generates a part for it, so invoking the service fails because there will be too many parameters 
+    * [CXF-1186] - WS-Addressing is working with the API approach
+    * [CXF-1187] - Using Spring  <context:annotation-config /> spawns creation error on  org.apache.cxf.transport.servlet.ServletTransportFactory
+    * [CXF-1192] - Jsr250BeanPostProcessor, non reentrant ResourceInjector results in IllegalArgumentException
+    * [CXF-1196] - @BindingType(SOAP11HTTP_MTOM_BINDING) is not activating MTOM
+    * [CXF-1202] - In/Out out of band headers causing Exception in HolderOutInterceptor
+    * [CXF-1212] - wsdl2java mojo dependency clash with testDependencies - no workaround available - new config option needed
+    * [CXF-1216] - WS-Addressing & .net Interop
+    * [CXF-1217] - Address in use errors from attempt to repeatedly start and stop services
+    * [CXF-1218] - Memory Leak in Policy Engine
+    * [CXF-1219] - Aegis databinding class XMLTypeCreator uses DocumentBuilderFactory.setSchema(aegisSchema), this is not implemented by all XML parsers, some throw UnsupportedOperationException, must be handled
+    * [CXF-1221] - update samples/integration/outbound sample.
+    * [CXF-1223] - Client code generates no parameters or return values for WSDL with multiple elements with same name
+    * [CXF-1225] - java2ws tooling is not fully merged to 2.0.x branch
+    * [CXF-1226] - elementFormDefault from package-info.java ignored with JAXWS+JAXB when there are no beans
+    * [CXF-1227] - NPE in HttpHeaderHelper.mapCharset
+    * [CXF-1236] - Scary warnings from new engine lifecycle
+    * [CXF-1238] - DispatchIndataBindingInterceptor removes out the inputStream even if it not a SOAP or XML Binding.
+    * [CXF-1244] - Application Exception not serialized properly
+    * [CXF-1245] - Thread hangs when processing response message using LocalTransport with dispatchDirect
+    * [CXF-1249] - CXF run with Spring 2.5  will get bean create error (out of stack memory) when CXF configures the endpoint with the <jaxws:endpoint> configure file
+    * [CXF-1251] - Error from CXF if optional method argument is missing
+    * [CXF-1256] - java.lang.SecurityException when i use cxf-codegen:wsdl2java for maven in netbeans ide
+    * [CXF-1260] - ConfigureImpl with spring construction duplicates looking for cxf.xml on the classpath and can error out with a warning
+    * [CXF-1264] - JettyHTTPDestination does not set a thread default bus
+    * [CXF-1273] - WSDLRefValidator can not pass if the type is xsd:anyType
+    * [CXF-1276] - Content-Encoding treated as a charset by HTTPConduit.WrappedOutputStream.handleResponse
+    * [CXF-1278] - ObjectFactory.class is missing when a JAXBContext is created and no WS addressing information is added
+    * [CXF-1290] - SecurityException in FileUtils.getDefaultTempDir
+    * [CXF-1294] - Problem creating several custom Headers
+    * [CXF-1296] - CXF throwing UnsupportedOperationException when including header.
+    * [CXF-1297] - Simple frontend clients don't work with wsdl first
+    * [CXF-1306] - samples/restful_http_binding/test.html does not work with IE (works with Firefox)
+    * [CXF-1308] - another javascript problem with restful_http_binding demo
+    * [CXF-1313] - MTOM client side can not unmarshal the returned Holder<Source>
+    * [CXF-1332] - CXF2.0.3 rejects wrapped array parameters when they have whitespace or comments
+    * [CXF-1333] - Aegis drops all but the last from an array of JDOMElements
+    * [CXF-1344] - Remove the duplicate Handler annotaion  when the service contains two ports
+    * [CXF-1346] - Please don't drop velocity.log files into the home directory
+    * [CXF-1351] - static DocumentBuilderFactory in XMLUtils cause ClassCastException when use different classloader
+    * [CXF-1383] - extensibleElement default is wrong for the Aegis-specific @XmlType annotation
+    * [CXF-1392] - Java first, unannotated exceptions are always written qualified although schema usually says unqualified.
+    * [CXF-1393] - WS-Policy PolicyBuilder implementation recognizes only a single policy namespace
+    * [CXF-1399] - JMS transport ignoreing Message.PROTOCOL_HEADERS
 
 ** Improvement
-    * [CXF-940] - adding operations to wsdls make old clients fail
-    * [CXF-1034] - JettyHTTPServerEngineFactory should automatically stop all jettyEngines which it buffered
-    * [CXF-1056] - Add a constructor to generated Service class for setting only WSDL location
-    * [CXF-1057] - wsdlvalidator does not support catalogs
-    * [CXF-1088] - document handling of case where spring aop breaks wsdl generation
-    * [CXF-1094] - Tooling binding file wsdllcaotion and schemaLocation improvement
-    * [CXF-1099] - if finalizeConfig in org.apache.cxf.transport.http.HTTPConduit could be protected or public
-    * [CXF-1109] - if org.apache.cxf.transport.http.HTTPConduit.WrappedOutputStream could be protected
-    * [CXF-1112] - Add catalog support for wsdlLocation and schemaLocation in customization binding file 
-    * [CXF-1134] - Adding a attribute in the JettyEngine's configuration to set the SO_REUSEADDR flage
-    * [CXF-1143] - Default CXF behavior of listing all available endpoints
-    * [CXF-1170] - Enhancement for tooling help text message format
-    * [CXF-1033] - Migrate to another logging solution rather than java.util.logging
-    * [CXF-1085] - EnhReq: Add support for TrustStores in PEM format
-    * [CXF-1158] - configurability of endpoint rewrting
-
-** Task
-    * [CXF-733] - Refactor the EJBServant 
-
-
-
-
-
-
-
-
-
+    * [CXF-1224] - Enable setting of JAXBContext config options from within Spring context
+    * [CXF-1237] - Update wsdltojava to make generated service qnames publicly accessible
+    * [CXF-1357] - Setting CXF eclipse output directory to be eclipse-classes instead of target
+    * [CXF-1055] - Validation of Aegis files would reduce user frustration
+    * [CXF-1167] - Add new feature to publish service infomation to external repository 
+    * [CXF-1199] - new ServiceContractResolver that cxf can resolve wsdl file from extension repository/storage
+    * [CXF-1195] - xjc dv plugin doesn't provide default values for enums
+    * [CXF-1206] - xjc dv plugin doesn't provide default values for complexTypes that contain elements
 
 

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml?rev=614005&r1=614004&r2=614005&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayJDOM.xml Mon Jan 21 12:51:29 2008
@@ -1,4 +1,22 @@
 <?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.
+-->
 <soap-env:Envelope xmlns:soap-env="http://schemas.xmlsoap.org/soap/envelope/" 
                    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
  <soap-env:Body xmlns:jns0='urn:Array' >

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayW3C.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayW3C.xml?rev=614005&r1=614004&r2=614005&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayW3C.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/integration/anyTypeArrayW3C.xml Mon Jan 21 12:51:29 2008
@@ -1,4 +1,22 @@
 <?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.
+-->
 <soap-env:Envelope xmlns:soap-env="http://schemas.xmlsoap.org/soap/envelope/" 
                    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
  <soap-env:Body xmlns:jns0='urn:Array' >

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=614005&r1=614004&r2=614005&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Mon Jan 21 12:51:29 2008
@@ -27,6 +27,16 @@
 import java.util.List;
 
 import javax.wsdl.Operation;
+<<<<<<< .working
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlSchema;
+=======
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlSchema;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Action;
+>>>>>>> .merge-right.r614001
 import javax.xml.ws.AsyncHandler;
 import javax.xml.ws.Service;
 import javax.xml.ws.Service.Mode;
@@ -309,7 +319,16 @@
             jaxWsConfiguration = new JaxWsServiceConfiguration();
             jaxWsConfiguration.setServiceFactory(this);
             getServiceConfigurations().add(0, jaxWsConfiguration);
+            
+            Class<?> seiClass = ii.getEndpointClass();
+            if (seiClass != null) {
+                XmlSchema schema = seiClass.getPackage().getAnnotation(XmlSchema.class);
+                if (schema != null && XmlNsForm.QUALIFIED.equals(schema.elementFormDefault())) {
+                    setQualifyWrapperSchema(true);
+                }
+            }
         }
-        methodDispatcher = new JAXWSMethodDispatcher(implInfo);
+        setMethodDispatcher(new JAXWSMethodDispatcher(implInfo));
+        
     }
 }

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/beans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/beans.xml?rev=614005&r1=614004&r2=614005&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/beans.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/beans.xml Mon Jan 21 12:51:29 2008
@@ -1,4 +1,22 @@
 <?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.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:jaxws="http://cxf.apache.org/jaxws" 

Modified: incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/resources/anytype.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/resources/anytype.wsdl?rev=614005&r1=614004&r2=614005&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/resources/anytype.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/resources/anytype.wsdl Mon Jan 21 12:51:29 2008
@@ -1,4 +1,22 @@
 <?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.
+-->
 <wsdl:definitions name="BaseDataTypesRpcLitService" targetNamespace="http://tempuri.org/" 
 		  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
 		  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/wsdl_addr.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/wsdl_addr.wsdl?rev=614005&r1=614004&r2=614005&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/wsdl_addr.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/wsdl_addr.wsdl Mon Jan 21 12:51:29 2008
@@ -1,3 +1,21 @@
+<!--
+  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.
+-->
 <definitions name="AddNumbers"  targetNamespace="http://example.com/" xmlns:tns="http://example.com/"
 	     xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"