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 2012/08/14 15:22:20 UTC
svn commit: r1372872 - in /cxf/branches/2.6.x-fixes: ./
api/src/main/resources/schemas/wsdl/
rt/databinding/sdo/src/main/resources/META-INF/ rt/rs/security/sso/saml/
rt/ws/mex/src/main/model/
tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290...
Author: dkulp
Date: Tue Aug 14 13:22:20 2012
New Revision: 1372872
URL: http://svn.apache.org/viewvc?rev=1372872&view=rev
Log:
Merged revisions 1371581 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1371581 | ffang | 2012-08-10 02:44:04 -0400 (Fri, 10 Aug 2012) | 1 line
change svn properties for security/sso/saml folder
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd
cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml
cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/ (props changed)
cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd
cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl
cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl
cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml
Propchange: cxf/branches/2.6.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd?rev=1372872&r1=1372871&r2=1372872&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd Tue Aug 14 13:22:20 2012
@@ -1,25 +1,25 @@
-<?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.
--->
-<xsd:schema targetNamespace="http://ws-i.org/profiles/basic/1.1/xsd"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:simpleType name="swaRef">
- <xsd:restriction base="xsd:anyURI" />
- </xsd:simpleType>
+<?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.
+-->
+<xsd:schema targetNamespace="http://ws-i.org/profiles/basic/1.1/xsd"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <xsd:simpleType name="swaRef">
+ <xsd:restriction base="xsd:anyURI" />
+ </xsd:simpleType>
</xsd:schema>
\ No newline at end of file
Modified: cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml?rev=1372872&r1=1372871&r2=1372872&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml Tue Aug 14 13:22:20 2012
@@ -1,24 +1,24 @@
-<?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.
--->
-<plugin name="sdo" version="" provider="tuscany.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
- <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
- <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
- <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
+<?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.
+-->
+<plugin name="sdo" version="" provider="tuscany.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
+ <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
+ <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
+ <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
</plugin>
\ No newline at end of file
Propchange: cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 14 13:22:20 2012
@@ -1 +1,8 @@
target
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
+.classpath
+.project
Modified: cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd?rev=1372872&r1=1372871&r2=1372872&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd Tue Aug 14 13:22:20 2012
@@ -1,112 +1,112 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
-(c) 2004-2006 BEA Systems Inc., Computer Associates International, Inc.,
-International Business Machines Corporation, Microsoft Corporation,
-Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved.
-
-Permission to copy and display the WS-MetadataExchange Specification
-(the "Specification"), in any medium without fee or royalty is hereby
-granted, provided that you include the following on ALL copies of the
-Specification that you make:
-
-1. A link or URL to the Specification at this location.
-2. The copyright notice as shown in the Specification.
-
-BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
-webMethods (collectively, the "Authors") each agree to grant you a
-license, under royalty-free and otherwise reasonable,
-non-discriminatory terms and conditions, to their respective essential
-patent claims that they deem necessary to implement the
-WS-MetadataExchange Specification.
-
-THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
-SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
-IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
-PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
-USE OR DISTRIBUTION OF THE SPECIFICATIONS.
-
-The name and trademarks of the Authors may NOT be used in any manner,
-including advertising or publicity pertaining to the Specifications or
-their contents without specific, written prior permission. Title to
-copyright in the Specifications will at all times remain with the
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
--->
-
-<xs:schema
- targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
- xmlns:tns='http://schemas.xmlsoap.org/ws/2004/09/mex'
- xmlns:wsa10='http://www.w3.org/2005/08/addressing'
- xmlns:wsa04='http://schemas.xmlsoap.org/ws/2004/08/addressing'
- xmlns:xs='http://www.w3.org/2001/XMLSchema'
- elementFormDefault='qualified'
- blockDefault='#all' >
-
- <!-- Get Metadata request -->
- <xs:element name='GetMetadata' >
- <xs:complexType>
- <xs:sequence>
- <xs:element ref='tns:Dialect' minOccurs='0' />
- <xs:element ref='tns:Identifier' minOccurs='0' />
- </xs:sequence>
- <xs:anyAttribute namespace='##other' processContents='lax' />
- </xs:complexType>
- </xs:element>
-
- <xs:element name='Dialect' type='xs:anyURI' />
- <xs:element name='Identifier' type='xs:anyURI' />
-
- <!-- Get Metadata response -->
- <xs:element name='Metadata' >
- <xs:complexType>
- <xs:sequence>
- <xs:element ref='tns:MetadataSection'
- minOccurs='0'
- maxOccurs='unbounded' />
- <xs:any namespace='##other' processContents='lax'
- minOccurs='0'
- maxOccurs='unbounded' />
- </xs:sequence>
- <xs:anyAttribute namespace='##other' processContents='lax' />
- </xs:complexType>
- </xs:element>
-
- <xs:element name='MetadataSection' >
- <xs:complexType>
- <xs:choice>
- <xs:any namespace='##other' processContents='lax' />
- <xs:element ref='tns:MetadataReference' />
- <xs:element ref='tns:Location' />
- </xs:choice>
- <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
- <xs:attribute name='Identifier' type='xs:anyURI' />
- <xs:anyAttribute namespace='##other' processContents='lax' />
- </xs:complexType>
- </xs:element>
-
- <!--
- Ideally, the type of the MetadataReference would have been
- the union of wsa04:EndpointReferenceType and
- wsa10:EndpointReferenceType but unfortunately xs:union only
- works for simple types. As a result, we have to define
- the mex:MetadataReference using xs:any.
- -->
-
- <xs:element name='MetadataReference'>
- <xs:complexType>
- <xs:sequence>
- <xs:any minOccurs='1' maxOccurs='unbounded'
- processContents='lax' namespace='##other' />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name='Location'
- type='xs:anyURI' />
-</xs:schema>
+<?xml version='1.0' encoding='UTF-8' ?>
+<!--
+(c) 2004-2006 BEA Systems Inc., Computer Associates International, Inc.,
+International Business Machines Corporation, Microsoft Corporation,
+Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved.
+
+Permission to copy and display the WS-MetadataExchange Specification
+(the "Specification"), in any medium without fee or royalty is hereby
+granted, provided that you include the following on ALL copies of the
+Specification that you make:
+
+1. A link or URL to the Specification at this location.
+2. The copyright notice as shown in the Specification.
+
+BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
+webMethods (collectively, the "Authors") each agree to grant you a
+license, under royalty-free and otherwise reasonable,
+non-discriminatory terms and conditions, to their respective essential
+patent claims that they deem necessary to implement the
+WS-MetadataExchange Specification.
+
+THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
+REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
+SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
+IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
+USE OR DISTRIBUTION OF THE SPECIFICATIONS.
+
+The name and trademarks of the Authors may NOT be used in any manner,
+including advertising or publicity pertaining to the Specifications or
+their contents without specific, written prior permission. Title to
+copyright in the Specifications will at all times remain with the
+Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+-->
+
+<xs:schema
+ targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
+ xmlns:tns='http://schemas.xmlsoap.org/ws/2004/09/mex'
+ xmlns:wsa10='http://www.w3.org/2005/08/addressing'
+ xmlns:wsa04='http://schemas.xmlsoap.org/ws/2004/08/addressing'
+ xmlns:xs='http://www.w3.org/2001/XMLSchema'
+ elementFormDefault='qualified'
+ blockDefault='#all' >
+
+ <!-- Get Metadata request -->
+ <xs:element name='GetMetadata' >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref='tns:Dialect' minOccurs='0' />
+ <xs:element ref='tns:Identifier' minOccurs='0' />
+ </xs:sequence>
+ <xs:anyAttribute namespace='##other' processContents='lax' />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name='Dialect' type='xs:anyURI' />
+ <xs:element name='Identifier' type='xs:anyURI' />
+
+ <!-- Get Metadata response -->
+ <xs:element name='Metadata' >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref='tns:MetadataSection'
+ minOccurs='0'
+ maxOccurs='unbounded' />
+ <xs:any namespace='##other' processContents='lax'
+ minOccurs='0'
+ maxOccurs='unbounded' />
+ </xs:sequence>
+ <xs:anyAttribute namespace='##other' processContents='lax' />
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name='MetadataSection' >
+ <xs:complexType>
+ <xs:choice>
+ <xs:any namespace='##other' processContents='lax' />
+ <xs:element ref='tns:MetadataReference' />
+ <xs:element ref='tns:Location' />
+ </xs:choice>
+ <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
+ <xs:attribute name='Identifier' type='xs:anyURI' />
+ <xs:anyAttribute namespace='##other' processContents='lax' />
+ </xs:complexType>
+ </xs:element>
+
+ <!--
+ Ideally, the type of the MetadataReference would have been
+ the union of wsa04:EndpointReferenceType and
+ wsa10:EndpointReferenceType but unfortunately xs:union only
+ works for simple types. As a result, we have to define
+ the mex:MetadataReference using xs:any.
+ -->
+
+ <xs:element name='MetadataReference'>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:any minOccurs='1' maxOccurs='unbounded'
+ processContents='lax' namespace='##other' />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name='Location'
+ type='xs:anyURI' />
+</xs:schema>
Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl (original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl Tue Aug 14 13:22:20 2012
@@ -1,51 +1,51 @@
-<?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
- xmlns:tns="http://bugs3290.cxf.apache.org/services/bug1"
- xmlns:bug2="http://bugs3290.cxf.apache.org/services/bug2"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://bugs3290.cxf.apache.org/services/bug1"
- name="bug1">
-
-<wsdl:import namespace="http://bugs3290.cxf.apache.org/services/bug2" location="bug2.wsdl" />
-
- <wsdl:binding name="myBug1PortSoapBinding" type="bug2:myBugService">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
-
- <wsdl:operation name="myBug1">
- <soap:operation style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="myBugService">
- <wsdl:port name="myBug1" binding="tns:myBug1PortSoapBinding">
- <soap:address location="http://REPLACE_WITH_HOST_INFO/myBug1" />
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
+<?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
+ xmlns:tns="http://bugs3290.cxf.apache.org/services/bug1"
+ xmlns:bug2="http://bugs3290.cxf.apache.org/services/bug2"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ targetNamespace="http://bugs3290.cxf.apache.org/services/bug1"
+ name="bug1">
+
+<wsdl:import namespace="http://bugs3290.cxf.apache.org/services/bug2" location="bug2.wsdl" />
+
+ <wsdl:binding name="myBug1PortSoapBinding" type="bug2:myBugService">
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+
+ <wsdl:operation name="myBug1">
+ <soap:operation style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="myBugService">
+ <wsdl:port name="myBug1" binding="tns:myBug1PortSoapBinding">
+ <soap:address location="http://REPLACE_WITH_HOST_INFO/myBug1" />
+ </wsdl:port>
+ </wsdl:service>
+
+</wsdl:definitions>
Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl (original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl Tue Aug 14 13:22:20 2012
@@ -1,65 +1,65 @@
-<?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
- xmlns:tns="http://bugs3290.cxf.apache.org/services/bug2"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://bugs3290.cxf.apache.org/services/bug2"
- name="bug2">
-
- <wsdl:types>
-
- <schema xmlns="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" attributeFormDefault="qualified"
- targetNamespace="http://bugs3290.cxf.apache.org/services/bug2">
-
- <xsd:complexType name="requestDataType">
- <xsd:sequence>
- <xsd:element name="myString1" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="responseDataType">
- <xsd:sequence>
- <xsd:element name="myString2" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
-
- <element name="myBug1" type="tns:requestDataType" />
- <element name="myBug1Response" type="tns:responseDataType" />
- </schema>
- </wsdl:types>
-
- <wsdl:message name="myBug1RequestMessage">
- <wsdl:part name="parameters" element="tns:myBug1" />
- </wsdl:message>
- <wsdl:message name="myBug1ResponseMessage">
- <wsdl:part name="parameters" element="tns:myBug1Response" />
- </wsdl:message>
-
- <wsdl:portType name="myBugService">
- <wsdl:operation name="myBug1">
- <wsdl:input message="tns:myBug1RequestMessage" />
- <wsdl:output message="tns:myBug1ResponseMessage" />
- </wsdl:operation>
- </wsdl:portType>
-
-</wsdl:definitions>
+<?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
+ xmlns:tns="http://bugs3290.cxf.apache.org/services/bug2"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ targetNamespace="http://bugs3290.cxf.apache.org/services/bug2"
+ name="bug2">
+
+ <wsdl:types>
+
+ <schema xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified" attributeFormDefault="qualified"
+ targetNamespace="http://bugs3290.cxf.apache.org/services/bug2">
+
+ <xsd:complexType name="requestDataType">
+ <xsd:sequence>
+ <xsd:element name="myString1" type="xsd:string" />
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="responseDataType">
+ <xsd:sequence>
+ <xsd:element name="myString2" type="xsd:string" />
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <element name="myBug1" type="tns:requestDataType" />
+ <element name="myBug1Response" type="tns:responseDataType" />
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="myBug1RequestMessage">
+ <wsdl:part name="parameters" element="tns:myBug1" />
+ </wsdl:message>
+ <wsdl:message name="myBug1ResponseMessage">
+ <wsdl:part name="parameters" element="tns:myBug1Response" />
+ </wsdl:message>
+
+ <wsdl:portType name="myBugService">
+ <wsdl:operation name="myBug1">
+ <wsdl:input message="tns:myBug1RequestMessage" />
+ <wsdl:output message="tns:myBug1ResponseMessage" />
+ </wsdl:operation>
+ </wsdl:portType>
+
+</wsdl:definitions>
Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl (original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl Tue Aug 14 13:22:20 2012
@@ -1,89 +1,89 @@
-<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
- <wsdl:types>
- <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
- <xsd:complexType name="loginrequesttype">
- <xsd:sequence>
- <xsd:element name="username" type="xsd:string"/>
- <xsd:element name="password" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="loginresponsetype">
- <xsd:sequence>
- <xsd:element name="userid" type="xsd:int"/>
- <xsd:element name="groupid" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
-
-
- <xsd:element name="login">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="login" type="fc:loginrequesttype"/>
- <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="loginResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="login" type="fc:loginresponsetype"/>
- <xsd:element name="password_temp" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
-
- <wsdl:message name="loginRequest">
- <wsdl:part name="parameters" element="fc:login"/>
- </wsdl:message>
- <wsdl:message name="loginResponse">
- <wsdl:part name="parameters" element="fc:loginResponse"/>
- </wsdl:message>
-
-
- <wsdl:portType name="Login">
- <wsdl:operation name="login">
- <wsdl:input message="fc:loginRequest"/>
- <wsdl:output message="fc:loginResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="Login" type="fc:Login">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="login">
- <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="Login">
- <wsdl:port binding="fc:Login" name="center">
- <soap:address location="http://localhost:9000/"/>
- </wsdl:port>
- </wsdl:service>
-
+<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
+ <xsd:complexType name="loginrequesttype">
+ <xsd:sequence>
+ <xsd:element name="username" type="xsd:string"/>
+ <xsd:element name="password" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="loginresponsetype">
+ <xsd:sequence>
+ <xsd:element name="userid" type="xsd:int"/>
+ <xsd:element name="groupid" type="xsd:int"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+
+ <xsd:element name="login">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="login" type="fc:loginrequesttype"/>
+ <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="loginResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="login" type="fc:loginresponsetype"/>
+ <xsd:element name="password_temp" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="loginRequest">
+ <wsdl:part name="parameters" element="fc:login"/>
+ </wsdl:message>
+ <wsdl:message name="loginResponse">
+ <wsdl:part name="parameters" element="fc:loginResponse"/>
+ </wsdl:message>
+
+
+ <wsdl:portType name="Login">
+ <wsdl:operation name="login">
+ <wsdl:input message="fc:loginRequest"/>
+ <wsdl:output message="fc:loginResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="Login" type="fc:Login">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="login">
+ <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="Login">
+ <wsdl:port binding="fc:Login" name="center">
+ <soap:address location="http://localhost:9000/"/>
+ </wsdl:port>
+ </wsdl:service>
+
</wsdl:definitions>
\ No newline at end of file
Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml?rev=1372872&r1=1372871&r2=1372872&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml (original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml Tue Aug 14 13:22:20 2012
@@ -1,49 +1,49 @@
-<?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.
--->
-<jaxws:bindings wsdlLocation="cxf3105.wsdl"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
- http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
- <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
- <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
- <jaxb:property name="LoginRequest"/>
- </jaxb:bindings>
- <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
- <jaxb:property name="LoginResponse"/>
- </jaxb:bindings>
- <jaxb:bindings node="xs:element[@name='login']">
- <jaxb:class name="LoginRequest"/>
- </jaxb:bindings>
- </jaxws:bindings>
-
-
-
- <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
- <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
- <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
- </jaxws:bindings>
-
- <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
-</jaxws:bindings>
+<?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.
+-->
+<jaxws:bindings wsdlLocation="cxf3105.wsdl"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
+ http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
+ <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
+ <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
+ <jaxb:property name="LoginRequest"/>
+ </jaxb:bindings>
+ <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
+ <jaxb:property name="LoginResponse"/>
+ </jaxb:bindings>
+ <jaxb:bindings node="xs:element[@name='login']">
+ <jaxb:class name="LoginRequest"/>
+ </jaxb:bindings>
+ </jaxws:bindings>
+
+
+
+ <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
+ <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
+ <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
+ </jaxws:bindings>
+
+ <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
+</jaxws:bindings>
Re: svn commit: r1372872 - in /cxf/branches/2.6.x-fixes: ./ api/src/main/resources/schemas/wsdl/ rt/databinding/sdo/src/main/resources/META-INF/ rt/rs/security/sso/saml/ rt/ws/mex/src/main/model/ tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290...
Posted by Daniel Kulp <dk...@apache.org>.
Looks like it's all dos -> unix line style updates… mostly harmless, but annoying.
Dan
On Aug 14, 2012, at 9:24 AM, Daniel Kulp <dk...@apache.org> wrote:
>
> Something in the merge messed up and did a bunch of things it wasn't supposed to do… .on it.
>
> Dan
>
>
>
> On Aug 14, 2012, at 9:22 AM, dkulp@apache.org wrote:
>
>> Author: dkulp
>> Date: Tue Aug 14 13:22:20 2012
>> New Revision: 1372872
>>
>> URL: http://svn.apache.org/viewvc?rev=1372872&view=rev
>> Log:
>> Merged revisions 1371581 via svn merge from
>> https://svn.apache.org/repos/asf/cxf/trunk
>>
>> ........
>> r1371581 | ffang | 2012-08-10 02:44:04 -0400 (Fri, 10 Aug 2012) | 1 line
>>
>> change svn properties for security/sso/saml folder
>> ........
>>
>> Modified:
>> cxf/branches/2.6.x-fixes/ (props changed)
>> cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd
>> cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml
>> cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/ (props changed)
>> cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd
>> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl
>> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl
>> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
>> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml
>>
>> Propchange: cxf/branches/2.6.x-fixes/
>> ('svn:mergeinfo' removed)
>>
>> Propchange: cxf/branches/2.6.x-fixes/
>> ------------------------------------------------------------------------------
>> Binary property 'svnmerge-integrated' - no diff available.
>>
>> Modified: cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd
>> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd?rev=1372872&r1=1372871&r2=1372872&view=diff
>> ==============================================================================
>> --- cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd (original)
>> +++ cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd Tue Aug 14 13:22:20 2012
>> @@ -1,25 +1,25 @@
>> -<?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.
>> --->
>> -<xsd:schema targetNamespace="http://ws-i.org/profiles/basic/1.1/xsd"
>> - xmlns:xsd="http://www.w3.org/2001/XMLSchema">
>> - <xsd:simpleType name="swaRef">
>> - <xsd:restriction base="xsd:anyURI" />
>> - </xsd:simpleType>
>> +<?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.
>> +-->
>> +<xsd:schema targetNamespace="http://ws-i.org/profiles/basic/1.1/xsd"
>> + xmlns:xsd="http://www.w3.org/2001/XMLSchema">
>> + <xsd:simpleType name="swaRef">
>> + <xsd:restriction base="xsd:anyURI" />
>> + </xsd:simpleType>
>> </xsd:schema>
>> \ No newline at end of file
>>
>> Modified: cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml
>> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml?rev=1372872&r1=1372871&r2=1372872&view=diff
>> ==============================================================================
>> --- cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml (original)
>> +++ cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml Tue Aug 14 13:22:20 2012
>> @@ -1,24 +1,24 @@
>> -<?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.
>> --->
>> -<plugin name="sdo" version="" provider="tuscany.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
>> - <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
>> - <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
>> - <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
>> +<?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.
>> +-->
>> +<plugin name="sdo" version="" provider="tuscany.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
>> + <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
>> + <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
>> + <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
>> </plugin>
>> \ No newline at end of file
>>
>> Propchange: cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/
>> ------------------------------------------------------------------------------
>> --- svn:ignore (original)
>> +++ svn:ignore Tue Aug 14 13:22:20 2012
>> @@ -1 +1,8 @@
>> target
>> +.pmd
>> +.checkstyle
>> +.ruleset
>> +target
>> +.settings
>> +.classpath
>> +.project
>>
>> Modified: cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd
>> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd?rev=1372872&r1=1372871&r2=1372872&view=diff
>> ==============================================================================
>> --- cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd (original)
>> +++ cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd Tue Aug 14 13:22:20 2012
>> @@ -1,112 +1,112 @@
>> -<?xml version='1.0' encoding='UTF-8' ?>
>> -<!--
>> -(c) 2004-2006 BEA Systems Inc., Computer Associates International, Inc.,
>> -International Business Machines Corporation, Microsoft Corporation,
>> -Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved.
>> -
>> -Permission to copy and display the WS-MetadataExchange Specification
>> -(the "Specification"), in any medium without fee or royalty is hereby
>> -granted, provided that you include the following on ALL copies of the
>> -Specification that you make:
>> -
>> -1. A link or URL to the Specification at this location.
>> -2. The copyright notice as shown in the Specification.
>> -
>> -BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
>> -webMethods (collectively, the "Authors") each agree to grant you a
>> -license, under royalty-free and otherwise reasonable,
>> -non-discriminatory terms and conditions, to their respective essential
>> -patent claims that they deem necessary to implement the
>> -WS-MetadataExchange Specification.
>> -
>> -THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
>> -REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
>> -LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
>> -PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
>> -SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
>> -IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
>> -PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
>> -
>> -THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
>> -INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
>> -USE OR DISTRIBUTION OF THE SPECIFICATIONS.
>> -
>> -The name and trademarks of the Authors may NOT be used in any manner,
>> -including advertising or publicity pertaining to the Specifications or
>> -their contents without specific, written prior permission. Title to
>> -copyright in the Specifications will at all times remain with the
>> -Authors.
>> -
>> -No other rights are granted by implication, estoppel or otherwise.
>> --->
>> -
>> -<xs:schema
>> - targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
>> - xmlns:tns='http://schemas.xmlsoap.org/ws/2004/09/mex'
>> - xmlns:wsa10='http://www.w3.org/2005/08/addressing'
>> - xmlns:wsa04='http://schemas.xmlsoap.org/ws/2004/08/addressing'
>> - xmlns:xs='http://www.w3.org/2001/XMLSchema'
>> - elementFormDefault='qualified'
>> - blockDefault='#all' >
>> -
>> - <!-- Get Metadata request -->
>> - <xs:element name='GetMetadata' >
>> - <xs:complexType>
>> - <xs:sequence>
>> - <xs:element ref='tns:Dialect' minOccurs='0' />
>> - <xs:element ref='tns:Identifier' minOccurs='0' />
>> - </xs:sequence>
>> - <xs:anyAttribute namespace='##other' processContents='lax' />
>> - </xs:complexType>
>> - </xs:element>
>> -
>> - <xs:element name='Dialect' type='xs:anyURI' />
>> - <xs:element name='Identifier' type='xs:anyURI' />
>> -
>> - <!-- Get Metadata response -->
>> - <xs:element name='Metadata' >
>> - <xs:complexType>
>> - <xs:sequence>
>> - <xs:element ref='tns:MetadataSection'
>> - minOccurs='0'
>> - maxOccurs='unbounded' />
>> - <xs:any namespace='##other' processContents='lax'
>> - minOccurs='0'
>> - maxOccurs='unbounded' />
>> - </xs:sequence>
>> - <xs:anyAttribute namespace='##other' processContents='lax' />
>> - </xs:complexType>
>> - </xs:element>
>> -
>> - <xs:element name='MetadataSection' >
>> - <xs:complexType>
>> - <xs:choice>
>> - <xs:any namespace='##other' processContents='lax' />
>> - <xs:element ref='tns:MetadataReference' />
>> - <xs:element ref='tns:Location' />
>> - </xs:choice>
>> - <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
>> - <xs:attribute name='Identifier' type='xs:anyURI' />
>> - <xs:anyAttribute namespace='##other' processContents='lax' />
>> - </xs:complexType>
>> - </xs:element>
>> -
>> - <!--
>> - Ideally, the type of the MetadataReference would have been
>> - the union of wsa04:EndpointReferenceType and
>> - wsa10:EndpointReferenceType but unfortunately xs:union only
>> - works for simple types. As a result, we have to define
>> - the mex:MetadataReference using xs:any.
>> - -->
>> -
>> - <xs:element name='MetadataReference'>
>> - <xs:complexType>
>> - <xs:sequence>
>> - <xs:any minOccurs='1' maxOccurs='unbounded'
>> - processContents='lax' namespace='##other' />
>> - </xs:sequence>
>> - </xs:complexType>
>> - </xs:element>
>> - <xs:element name='Location'
>> - type='xs:anyURI' />
>> -</xs:schema>
>> +<?xml version='1.0' encoding='UTF-8' ?>
>> +<!--
>> +(c) 2004-2006 BEA Systems Inc., Computer Associates International, Inc.,
>> +International Business Machines Corporation, Microsoft Corporation,
>> +Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved.
>> +
>> +Permission to copy and display the WS-MetadataExchange Specification
>> +(the "Specification"), in any medium without fee or royalty is hereby
>> +granted, provided that you include the following on ALL copies of the
>> +Specification that you make:
>> +
>> +1. A link or URL to the Specification at this location.
>> +2. The copyright notice as shown in the Specification.
>> +
>> +BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
>> +webMethods (collectively, the "Authors") each agree to grant you a
>> +license, under royalty-free and otherwise reasonable,
>> +non-discriminatory terms and conditions, to their respective essential
>> +patent claims that they deem necessary to implement the
>> +WS-MetadataExchange Specification.
>> +
>> +THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
>> +REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
>> +LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
>> +PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
>> +SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
>> +IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
>> +PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
>> +
>> +THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
>> +INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
>> +USE OR DISTRIBUTION OF THE SPECIFICATIONS.
>> +
>> +The name and trademarks of the Authors may NOT be used in any manner,
>> +including advertising or publicity pertaining to the Specifications or
>> +their contents without specific, written prior permission. Title to
>> +copyright in the Specifications will at all times remain with the
>> +Authors.
>> +
>> +No other rights are granted by implication, estoppel or otherwise.
>> +-->
>> +
>> +<xs:schema
>> + targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
>> + xmlns:tns='http://schemas.xmlsoap.org/ws/2004/09/mex'
>> + xmlns:wsa10='http://www.w3.org/2005/08/addressing'
>> + xmlns:wsa04='http://schemas.xmlsoap.org/ws/2004/08/addressing'
>> + xmlns:xs='http://www.w3.org/2001/XMLSchema'
>> + elementFormDefault='qualified'
>> + blockDefault='#all' >
>> +
>> + <!-- Get Metadata request -->
>> + <xs:element name='GetMetadata' >
>> + <xs:complexType>
>> + <xs:sequence>
>> + <xs:element ref='tns:Dialect' minOccurs='0' />
>> + <xs:element ref='tns:Identifier' minOccurs='0' />
>> + </xs:sequence>
>> + <xs:anyAttribute namespace='##other' processContents='lax' />
>> + </xs:complexType>
>> + </xs:element>
>> +
>> + <xs:element name='Dialect' type='xs:anyURI' />
>> + <xs:element name='Identifier' type='xs:anyURI' />
>> +
>> + <!-- Get Metadata response -->
>> + <xs:element name='Metadata' >
>> + <xs:complexType>
>> + <xs:sequence>
>> + <xs:element ref='tns:MetadataSection'
>> + minOccurs='0'
>> + maxOccurs='unbounded' />
>> + <xs:any namespace='##other' processContents='lax'
>> + minOccurs='0'
>> + maxOccurs='unbounded' />
>> + </xs:sequence>
>> + <xs:anyAttribute namespace='##other' processContents='lax' />
>> + </xs:complexType>
>> + </xs:element>
>> +
>> + <xs:element name='MetadataSection' >
>> + <xs:complexType>
>> + <xs:choice>
>> + <xs:any namespace='##other' processContents='lax' />
>> + <xs:element ref='tns:MetadataReference' />
>> + <xs:element ref='tns:Location' />
>> + </xs:choice>
>> + <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
>> + <xs:attribute name='Identifier' type='xs:anyURI' />
>> + <xs:anyAttribute namespace='##other' processContents='lax' />
>> + </xs:complexType>
>> + </xs:element>
>> +
>> + <!--
>> + Ideally, the type of the MetadataReference would have been
>> + the union of wsa04:EndpointReferenceType and
>> + wsa10:EndpointReferenceType but unfortunately xs:union only
>> + works for simple types. As a result, we have to define
>> + the mex:MetadataReference using xs:any.
>> + -->
>> +
>> + <xs:element name='MetadataReference'>
>> + <xs:complexType>
>> + <xs:sequence>
>> + <xs:any minOccurs='1' maxOccurs='unbounded'
>> + processContents='lax' namespace='##other' />
>> + </xs:sequence>
>> + </xs:complexType>
>> + </xs:element>
>> + <xs:element name='Location'
>> + type='xs:anyURI' />
>> +</xs:schema>
>>
>> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl
>> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
>> ==============================================================================
>> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl (original)
>> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl Tue Aug 14 13:22:20 2012
>> @@ -1,51 +1,51 @@
>> -<?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
>> - xmlns:tns="http://bugs3290.cxf.apache.org/services/bug1"
>> - xmlns:bug2="http://bugs3290.cxf.apache.org/services/bug2"
>> - xmlns:xsd="http://www.w3.org/2001/XMLSchema"
>> - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
>> - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
>> - targetNamespace="http://bugs3290.cxf.apache.org/services/bug1"
>> - name="bug1">
>> -
>> -<wsdl:import namespace="http://bugs3290.cxf.apache.org/services/bug2" location="bug2.wsdl" />
>> -
>> - <wsdl:binding name="myBug1PortSoapBinding" type="bug2:myBugService">
>> - <soap:binding style="document"
>> - transport="http://schemas.xmlsoap.org/soap/http" />
>> -
>> - <wsdl:operation name="myBug1">
>> - <soap:operation style="document" />
>> - <wsdl:input>
>> - <soap:body use="literal" />
>> - </wsdl:input>
>> - <wsdl:output>
>> - <soap:body use="literal" />
>> - </wsdl:output>
>> - </wsdl:operation>
>> - </wsdl:binding>
>> - <wsdl:service name="myBugService">
>> - <wsdl:port name="myBug1" binding="tns:myBug1PortSoapBinding">
>> - <soap:address location="http://REPLACE_WITH_HOST_INFO/myBug1" />
>> - </wsdl:port>
>> - </wsdl:service>
>> -
>> -</wsdl:definitions>
>> +<?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
>> + xmlns:tns="http://bugs3290.cxf.apache.org/services/bug1"
>> + xmlns:bug2="http://bugs3290.cxf.apache.org/services/bug2"
>> + xmlns:xsd="http://www.w3.org/2001/XMLSchema"
>> + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
>> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
>> + targetNamespace="http://bugs3290.cxf.apache.org/services/bug1"
>> + name="bug1">
>> +
>> +<wsdl:import namespace="http://bugs3290.cxf.apache.org/services/bug2" location="bug2.wsdl" />
>> +
>> + <wsdl:binding name="myBug1PortSoapBinding" type="bug2:myBugService">
>> + <soap:binding style="document"
>> + transport="http://schemas.xmlsoap.org/soap/http" />
>> +
>> + <wsdl:operation name="myBug1">
>> + <soap:operation style="document" />
>> + <wsdl:input>
>> + <soap:body use="literal" />
>> + </wsdl:input>
>> + <wsdl:output>
>> + <soap:body use="literal" />
>> + </wsdl:output>
>> + </wsdl:operation>
>> + </wsdl:binding>
>> + <wsdl:service name="myBugService">
>> + <wsdl:port name="myBug1" binding="tns:myBug1PortSoapBinding">
>> + <soap:address location="http://REPLACE_WITH_HOST_INFO/myBug1" />
>> + </wsdl:port>
>> + </wsdl:service>
>> +
>> +</wsdl:definitions>
>>
>> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl
>> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
>> ==============================================================================
>> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl (original)
>> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl Tue Aug 14 13:22:20 2012
>> @@ -1,65 +1,65 @@
>> -<?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
>> - xmlns:tns="http://bugs3290.cxf.apache.org/services/bug2"
>> - xmlns:xsd="http://www.w3.org/2001/XMLSchema"
>> - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
>> - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
>> - targetNamespace="http://bugs3290.cxf.apache.org/services/bug2"
>> - name="bug2">
>> -
>> - <wsdl:types>
>> -
>> - <schema xmlns="http://www.w3.org/2001/XMLSchema"
>> - elementFormDefault="qualified" attributeFormDefault="qualified"
>> - targetNamespace="http://bugs3290.cxf.apache.org/services/bug2">
>> -
>> - <xsd:complexType name="requestDataType">
>> - <xsd:sequence>
>> - <xsd:element name="myString1" type="xsd:string" />
>> - </xsd:sequence>
>> - </xsd:complexType>
>> -
>> - <xsd:complexType name="responseDataType">
>> - <xsd:sequence>
>> - <xsd:element name="myString2" type="xsd:string" />
>> - </xsd:sequence>
>> - </xsd:complexType>
>> -
>> - <element name="myBug1" type="tns:requestDataType" />
>> - <element name="myBug1Response" type="tns:responseDataType" />
>> - </schema>
>> - </wsdl:types>
>> -
>> - <wsdl:message name="myBug1RequestMessage">
>> - <wsdl:part name="parameters" element="tns:myBug1" />
>> - </wsdl:message>
>> - <wsdl:message name="myBug1ResponseMessage">
>> - <wsdl:part name="parameters" element="tns:myBug1Response" />
>> - </wsdl:message>
>> -
>> - <wsdl:portType name="myBugService">
>> - <wsdl:operation name="myBug1">
>> - <wsdl:input message="tns:myBug1RequestMessage" />
>> - <wsdl:output message="tns:myBug1ResponseMessage" />
>> - </wsdl:operation>
>> - </wsdl:portType>
>> -
>> -</wsdl:definitions>
>> +<?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
>> + xmlns:tns="http://bugs3290.cxf.apache.org/services/bug2"
>> + xmlns:xsd="http://www.w3.org/2001/XMLSchema"
>> + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
>> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
>> + targetNamespace="http://bugs3290.cxf.apache.org/services/bug2"
>> + name="bug2">
>> +
>> + <wsdl:types>
>> +
>> + <schema xmlns="http://www.w3.org/2001/XMLSchema"
>> + elementFormDefault="qualified" attributeFormDefault="qualified"
>> + targetNamespace="http://bugs3290.cxf.apache.org/services/bug2">
>> +
>> + <xsd:complexType name="requestDataType">
>> + <xsd:sequence>
>> + <xsd:element name="myString1" type="xsd:string" />
>> + </xsd:sequence>
>> + </xsd:complexType>
>> +
>> + <xsd:complexType name="responseDataType">
>> + <xsd:sequence>
>> + <xsd:element name="myString2" type="xsd:string" />
>> + </xsd:sequence>
>> + </xsd:complexType>
>> +
>> + <element name="myBug1" type="tns:requestDataType" />
>> + <element name="myBug1Response" type="tns:responseDataType" />
>> + </schema>
>> + </wsdl:types>
>> +
>> + <wsdl:message name="myBug1RequestMessage">
>> + <wsdl:part name="parameters" element="tns:myBug1" />
>> + </wsdl:message>
>> + <wsdl:message name="myBug1ResponseMessage">
>> + <wsdl:part name="parameters" element="tns:myBug1Response" />
>> + </wsdl:message>
>> +
>> + <wsdl:portType name="myBugService">
>> + <wsdl:operation name="myBug1">
>> + <wsdl:input message="tns:myBug1RequestMessage" />
>> + <wsdl:output message="tns:myBug1ResponseMessage" />
>> + </wsdl:operation>
>> + </wsdl:portType>
>> +
>> +</wsdl:definitions>
>>
>> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
>> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
>> ==============================================================================
>> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl (original)
>> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl Tue Aug 14 13:22:20 2012
>> @@ -1,89 +1,89 @@
>> -<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
>> - <wsdl:types>
>> - <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
>> - <xsd:complexType name="loginrequesttype">
>> - <xsd:sequence>
>> - <xsd:element name="username" type="xsd:string"/>
>> - <xsd:element name="password" type="xsd:string"/>
>> - </xsd:sequence>
>> - </xsd:complexType>
>> - <xsd:complexType name="loginresponsetype">
>> - <xsd:sequence>
>> - <xsd:element name="userid" type="xsd:int"/>
>> - <xsd:element name="groupid" type="xsd:int"/>
>> - </xsd:sequence>
>> - </xsd:complexType>
>> -
>> -
>> - <xsd:element name="login">
>> - <xsd:complexType>
>> - <xsd:sequence>
>> - <xsd:element name="login" type="fc:loginrequesttype"/>
>> - <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
>> - </xsd:sequence>
>> - </xsd:complexType>
>> - </xsd:element>
>> - <xsd:element name="loginResponse">
>> - <xsd:complexType>
>> - <xsd:sequence>
>> - <xsd:element name="login" type="fc:loginresponsetype"/>
>> - <xsd:element name="password_temp" type="xsd:string"/>
>> - </xsd:sequence>
>> - </xsd:complexType>
>> - </xsd:element>
>> - </xsd:schema>
>> - </wsdl:types>
>> -
>> - <wsdl:message name="loginRequest">
>> - <wsdl:part name="parameters" element="fc:login"/>
>> - </wsdl:message>
>> - <wsdl:message name="loginResponse">
>> - <wsdl:part name="parameters" element="fc:loginResponse"/>
>> - </wsdl:message>
>> -
>> -
>> - <wsdl:portType name="Login">
>> - <wsdl:operation name="login">
>> - <wsdl:input message="fc:loginRequest"/>
>> - <wsdl:output message="fc:loginResponse"/>
>> - </wsdl:operation>
>> - </wsdl:portType>
>> - <wsdl:binding name="Login" type="fc:Login">
>> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
>> -
>> - <wsdl:operation name="login">
>> - <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
>> - <wsdl:input>
>> - <soap:body use="literal"/>
>> - </wsdl:input>
>> - <wsdl:output>
>> - <soap:body use="literal"/>
>> - </wsdl:output>
>> - </wsdl:operation>
>> - </wsdl:binding>
>> - <wsdl:service name="Login">
>> - <wsdl:port binding="fc:Login" name="center">
>> - <soap:address location="http://localhost:9000/"/>
>> - </wsdl:port>
>> - </wsdl:service>
>> -
>> +<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
>> + <wsdl:types>
>> + <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
>> + <xsd:complexType name="loginrequesttype">
>> + <xsd:sequence>
>> + <xsd:element name="username" type="xsd:string"/>
>> + <xsd:element name="password" type="xsd:string"/>
>> + </xsd:sequence>
>> + </xsd:complexType>
>> + <xsd:complexType name="loginresponsetype">
>> + <xsd:sequence>
>> + <xsd:element name="userid" type="xsd:int"/>
>> + <xsd:element name="groupid" type="xsd:int"/>
>> + </xsd:sequence>
>> + </xsd:complexType>
>> +
>> +
>> + <xsd:element name="login">
>> + <xsd:complexType>
>> + <xsd:sequence>
>> + <xsd:element name="login" type="fc:loginrequesttype"/>
>> + <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
>> + </xsd:sequence>
>> + </xsd:complexType>
>> + </xsd:element>
>> + <xsd:element name="loginResponse">
>> + <xsd:complexType>
>> + <xsd:sequence>
>> + <xsd:element name="login" type="fc:loginresponsetype"/>
>> + <xsd:element name="password_temp" type="xsd:string"/>
>> + </xsd:sequence>
>> + </xsd:complexType>
>> + </xsd:element>
>> + </xsd:schema>
>> + </wsdl:types>
>> +
>> + <wsdl:message name="loginRequest">
>> + <wsdl:part name="parameters" element="fc:login"/>
>> + </wsdl:message>
>> + <wsdl:message name="loginResponse">
>> + <wsdl:part name="parameters" element="fc:loginResponse"/>
>> + </wsdl:message>
>> +
>> +
>> + <wsdl:portType name="Login">
>> + <wsdl:operation name="login">
>> + <wsdl:input message="fc:loginRequest"/>
>> + <wsdl:output message="fc:loginResponse"/>
>> + </wsdl:operation>
>> + </wsdl:portType>
>> + <wsdl:binding name="Login" type="fc:Login">
>> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
>> +
>> + <wsdl:operation name="login">
>> + <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
>> + <wsdl:input>
>> + <soap:body use="literal"/>
>> + </wsdl:input>
>> + <wsdl:output>
>> + <soap:body use="literal"/>
>> + </wsdl:output>
>> + </wsdl:operation>
>> + </wsdl:binding>
>> + <wsdl:service name="Login">
>> + <wsdl:port binding="fc:Login" name="center">
>> + <soap:address location="http://localhost:9000/"/>
>> + </wsdl:port>
>> + </wsdl:service>
>> +
>> </wsdl:definitions>
>> \ No newline at end of file
>>
>> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml
>> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml?rev=1372872&r1=1372871&r2=1372872&view=diff
>> ==============================================================================
>> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml (original)
>> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml Tue Aug 14 13:22:20 2012
>> @@ -1,49 +1,49 @@
>> -<?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.
>> --->
>> -<jaxws:bindings wsdlLocation="cxf3105.wsdl"
>> - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
>> - xmlns:xs="http://www.w3.org/2001/XMLSchema"
>> - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>> - xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
>> - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
>> - xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
>> - xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
>> - http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
>> - <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
>> - <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
>> - <jaxb:property name="LoginRequest"/>
>> - </jaxb:bindings>
>> - <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
>> - <jaxb:property name="LoginResponse"/>
>> - </jaxb:bindings>
>> - <jaxb:bindings node="xs:element[@name='login']">
>> - <jaxb:class name="LoginRequest"/>
>> - </jaxb:bindings>
>> - </jaxws:bindings>
>> -
>> -
>> -
>> - <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
>> - <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
>> - <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
>> - </jaxws:bindings>
>> -
>> - <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
>> -</jaxws:bindings>
>> +<?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.
>> +-->
>> +<jaxws:bindings wsdlLocation="cxf3105.wsdl"
>> + xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
>> + xmlns:xs="http://www.w3.org/2001/XMLSchema"
>> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>> + xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
>> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
>> + xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
>> + xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
>> + http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
>> + <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
>> + <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
>> + <jaxb:property name="LoginRequest"/>
>> + </jaxb:bindings>
>> + <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
>> + <jaxb:property name="LoginResponse"/>
>> + </jaxb:bindings>
>> + <jaxb:bindings node="xs:element[@name='login']">
>> + <jaxb:class name="LoginRequest"/>
>> + </jaxb:bindings>
>> + </jaxws:bindings>
>> +
>> +
>> +
>> + <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
>> + <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
>> + <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
>> + </jaxws:bindings>
>> +
>> + <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
>> +</jaxws:bindings>
>>
>>
>
> --
> Daniel Kulp
> dkulp@apache.org - http://dankulp.com/blog
> Talend Community Coder - http://coders.talend.com
>
--
Daniel Kulp
dkulp@apache.org - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com
Re: svn commit: r1372872 - in /cxf/branches/2.6.x-fixes: ./ api/src/main/resources/schemas/wsdl/ rt/databinding/sdo/src/main/resources/META-INF/ rt/rs/security/sso/saml/ rt/ws/mex/src/main/model/ tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290...
Posted by Daniel Kulp <dk...@apache.org>.
Something in the merge messed up and did a bunch of things it wasn't supposed to do… .on it.
Dan
On Aug 14, 2012, at 9:22 AM, dkulp@apache.org wrote:
> Author: dkulp
> Date: Tue Aug 14 13:22:20 2012
> New Revision: 1372872
>
> URL: http://svn.apache.org/viewvc?rev=1372872&view=rev
> Log:
> Merged revisions 1371581 via svn merge from
> https://svn.apache.org/repos/asf/cxf/trunk
>
> ........
> r1371581 | ffang | 2012-08-10 02:44:04 -0400 (Fri, 10 Aug 2012) | 1 line
>
> change svn properties for security/sso/saml folder
> ........
>
> Modified:
> cxf/branches/2.6.x-fixes/ (props changed)
> cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd
> cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml
> cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/ (props changed)
> cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd
> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl
> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl
> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml
>
> Propchange: cxf/branches/2.6.x-fixes/
> ('svn:mergeinfo' removed)
>
> Propchange: cxf/branches/2.6.x-fixes/
> ------------------------------------------------------------------------------
> Binary property 'svnmerge-integrated' - no diff available.
>
> Modified: cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd (original)
> +++ cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd Tue Aug 14 13:22:20 2012
> @@ -1,25 +1,25 @@
> -<?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.
> --->
> -<xsd:schema targetNamespace="http://ws-i.org/profiles/basic/1.1/xsd"
> - xmlns:xsd="http://www.w3.org/2001/XMLSchema">
> - <xsd:simpleType name="swaRef">
> - <xsd:restriction base="xsd:anyURI" />
> - </xsd:simpleType>
> +<?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.
> +-->
> +<xsd:schema targetNamespace="http://ws-i.org/profiles/basic/1.1/xsd"
> + xmlns:xsd="http://www.w3.org/2001/XMLSchema">
> + <xsd:simpleType name="swaRef">
> + <xsd:restriction base="xsd:anyURI" />
> + </xsd:simpleType>
> </xsd:schema>
> \ No newline at end of file
>
> Modified: cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml (original)
> +++ cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml Tue Aug 14 13:22:20 2012
> @@ -1,24 +1,24 @@
> -<?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.
> --->
> -<plugin name="sdo" version="" provider="tuscany.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
> - <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> - <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> - <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> +<?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.
> +-->
> +<plugin name="sdo" version="" provider="tuscany.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
> + <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> + <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> + <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> </plugin>
> \ No newline at end of file
>
> Propchange: cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/
> ------------------------------------------------------------------------------
> --- svn:ignore (original)
> +++ svn:ignore Tue Aug 14 13:22:20 2012
> @@ -1 +1,8 @@
> target
> +.pmd
> +.checkstyle
> +.ruleset
> +target
> +.settings
> +.classpath
> +.project
>
> Modified: cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd (original)
> +++ cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd Tue Aug 14 13:22:20 2012
> @@ -1,112 +1,112 @@
> -<?xml version='1.0' encoding='UTF-8' ?>
> -<!--
> -(c) 2004-2006 BEA Systems Inc., Computer Associates International, Inc.,
> -International Business Machines Corporation, Microsoft Corporation,
> -Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved.
> -
> -Permission to copy and display the WS-MetadataExchange Specification
> -(the "Specification"), in any medium without fee or royalty is hereby
> -granted, provided that you include the following on ALL copies of the
> -Specification that you make:
> -
> -1. A link or URL to the Specification at this location.
> -2. The copyright notice as shown in the Specification.
> -
> -BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
> -webMethods (collectively, the "Authors") each agree to grant you a
> -license, under royalty-free and otherwise reasonable,
> -non-discriminatory terms and conditions, to their respective essential
> -patent claims that they deem necessary to implement the
> -WS-MetadataExchange Specification.
> -
> -THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
> -REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
> -LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
> -PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
> -SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
> -IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
> -PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
> -
> -THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
> -INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
> -USE OR DISTRIBUTION OF THE SPECIFICATIONS.
> -
> -The name and trademarks of the Authors may NOT be used in any manner,
> -including advertising or publicity pertaining to the Specifications or
> -their contents without specific, written prior permission. Title to
> -copyright in the Specifications will at all times remain with the
> -Authors.
> -
> -No other rights are granted by implication, estoppel or otherwise.
> --->
> -
> -<xs:schema
> - targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
> - xmlns:tns='http://schemas.xmlsoap.org/ws/2004/09/mex'
> - xmlns:wsa10='http://www.w3.org/2005/08/addressing'
> - xmlns:wsa04='http://schemas.xmlsoap.org/ws/2004/08/addressing'
> - xmlns:xs='http://www.w3.org/2001/XMLSchema'
> - elementFormDefault='qualified'
> - blockDefault='#all' >
> -
> - <!-- Get Metadata request -->
> - <xs:element name='GetMetadata' >
> - <xs:complexType>
> - <xs:sequence>
> - <xs:element ref='tns:Dialect' minOccurs='0' />
> - <xs:element ref='tns:Identifier' minOccurs='0' />
> - </xs:sequence>
> - <xs:anyAttribute namespace='##other' processContents='lax' />
> - </xs:complexType>
> - </xs:element>
> -
> - <xs:element name='Dialect' type='xs:anyURI' />
> - <xs:element name='Identifier' type='xs:anyURI' />
> -
> - <!-- Get Metadata response -->
> - <xs:element name='Metadata' >
> - <xs:complexType>
> - <xs:sequence>
> - <xs:element ref='tns:MetadataSection'
> - minOccurs='0'
> - maxOccurs='unbounded' />
> - <xs:any namespace='##other' processContents='lax'
> - minOccurs='0'
> - maxOccurs='unbounded' />
> - </xs:sequence>
> - <xs:anyAttribute namespace='##other' processContents='lax' />
> - </xs:complexType>
> - </xs:element>
> -
> - <xs:element name='MetadataSection' >
> - <xs:complexType>
> - <xs:choice>
> - <xs:any namespace='##other' processContents='lax' />
> - <xs:element ref='tns:MetadataReference' />
> - <xs:element ref='tns:Location' />
> - </xs:choice>
> - <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
> - <xs:attribute name='Identifier' type='xs:anyURI' />
> - <xs:anyAttribute namespace='##other' processContents='lax' />
> - </xs:complexType>
> - </xs:element>
> -
> - <!--
> - Ideally, the type of the MetadataReference would have been
> - the union of wsa04:EndpointReferenceType and
> - wsa10:EndpointReferenceType but unfortunately xs:union only
> - works for simple types. As a result, we have to define
> - the mex:MetadataReference using xs:any.
> - -->
> -
> - <xs:element name='MetadataReference'>
> - <xs:complexType>
> - <xs:sequence>
> - <xs:any minOccurs='1' maxOccurs='unbounded'
> - processContents='lax' namespace='##other' />
> - </xs:sequence>
> - </xs:complexType>
> - </xs:element>
> - <xs:element name='Location'
> - type='xs:anyURI' />
> -</xs:schema>
> +<?xml version='1.0' encoding='UTF-8' ?>
> +<!--
> +(c) 2004-2006 BEA Systems Inc., Computer Associates International, Inc.,
> +International Business Machines Corporation, Microsoft Corporation,
> +Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved.
> +
> +Permission to copy and display the WS-MetadataExchange Specification
> +(the "Specification"), in any medium without fee or royalty is hereby
> +granted, provided that you include the following on ALL copies of the
> +Specification that you make:
> +
> +1. A link or URL to the Specification at this location.
> +2. The copyright notice as shown in the Specification.
> +
> +BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
> +webMethods (collectively, the "Authors") each agree to grant you a
> +license, under royalty-free and otherwise reasonable,
> +non-discriminatory terms and conditions, to their respective essential
> +patent claims that they deem necessary to implement the
> +WS-MetadataExchange Specification.
> +
> +THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
> +REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
> +LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
> +PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
> +SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
> +IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
> +PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
> +
> +THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
> +INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
> +USE OR DISTRIBUTION OF THE SPECIFICATIONS.
> +
> +The name and trademarks of the Authors may NOT be used in any manner,
> +including advertising or publicity pertaining to the Specifications or
> +their contents without specific, written prior permission. Title to
> +copyright in the Specifications will at all times remain with the
> +Authors.
> +
> +No other rights are granted by implication, estoppel or otherwise.
> +-->
> +
> +<xs:schema
> + targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
> + xmlns:tns='http://schemas.xmlsoap.org/ws/2004/09/mex'
> + xmlns:wsa10='http://www.w3.org/2005/08/addressing'
> + xmlns:wsa04='http://schemas.xmlsoap.org/ws/2004/08/addressing'
> + xmlns:xs='http://www.w3.org/2001/XMLSchema'
> + elementFormDefault='qualified'
> + blockDefault='#all' >
> +
> + <!-- Get Metadata request -->
> + <xs:element name='GetMetadata' >
> + <xs:complexType>
> + <xs:sequence>
> + <xs:element ref='tns:Dialect' minOccurs='0' />
> + <xs:element ref='tns:Identifier' minOccurs='0' />
> + </xs:sequence>
> + <xs:anyAttribute namespace='##other' processContents='lax' />
> + </xs:complexType>
> + </xs:element>
> +
> + <xs:element name='Dialect' type='xs:anyURI' />
> + <xs:element name='Identifier' type='xs:anyURI' />
> +
> + <!-- Get Metadata response -->
> + <xs:element name='Metadata' >
> + <xs:complexType>
> + <xs:sequence>
> + <xs:element ref='tns:MetadataSection'
> + minOccurs='0'
> + maxOccurs='unbounded' />
> + <xs:any namespace='##other' processContents='lax'
> + minOccurs='0'
> + maxOccurs='unbounded' />
> + </xs:sequence>
> + <xs:anyAttribute namespace='##other' processContents='lax' />
> + </xs:complexType>
> + </xs:element>
> +
> + <xs:element name='MetadataSection' >
> + <xs:complexType>
> + <xs:choice>
> + <xs:any namespace='##other' processContents='lax' />
> + <xs:element ref='tns:MetadataReference' />
> + <xs:element ref='tns:Location' />
> + </xs:choice>
> + <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
> + <xs:attribute name='Identifier' type='xs:anyURI' />
> + <xs:anyAttribute namespace='##other' processContents='lax' />
> + </xs:complexType>
> + </xs:element>
> +
> + <!--
> + Ideally, the type of the MetadataReference would have been
> + the union of wsa04:EndpointReferenceType and
> + wsa10:EndpointReferenceType but unfortunately xs:union only
> + works for simple types. As a result, we have to define
> + the mex:MetadataReference using xs:any.
> + -->
> +
> + <xs:element name='MetadataReference'>
> + <xs:complexType>
> + <xs:sequence>
> + <xs:any minOccurs='1' maxOccurs='unbounded'
> + processContents='lax' namespace='##other' />
> + </xs:sequence>
> + </xs:complexType>
> + </xs:element>
> + <xs:element name='Location'
> + type='xs:anyURI' />
> +</xs:schema>
>
> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl (original)
> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl Tue Aug 14 13:22:20 2012
> @@ -1,51 +1,51 @@
> -<?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
> - xmlns:tns="http://bugs3290.cxf.apache.org/services/bug1"
> - xmlns:bug2="http://bugs3290.cxf.apache.org/services/bug2"
> - xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
> - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> - targetNamespace="http://bugs3290.cxf.apache.org/services/bug1"
> - name="bug1">
> -
> -<wsdl:import namespace="http://bugs3290.cxf.apache.org/services/bug2" location="bug2.wsdl" />
> -
> - <wsdl:binding name="myBug1PortSoapBinding" type="bug2:myBugService">
> - <soap:binding style="document"
> - transport="http://schemas.xmlsoap.org/soap/http" />
> -
> - <wsdl:operation name="myBug1">
> - <soap:operation style="document" />
> - <wsdl:input>
> - <soap:body use="literal" />
> - </wsdl:input>
> - <wsdl:output>
> - <soap:body use="literal" />
> - </wsdl:output>
> - </wsdl:operation>
> - </wsdl:binding>
> - <wsdl:service name="myBugService">
> - <wsdl:port name="myBug1" binding="tns:myBug1PortSoapBinding">
> - <soap:address location="http://REPLACE_WITH_HOST_INFO/myBug1" />
> - </wsdl:port>
> - </wsdl:service>
> -
> -</wsdl:definitions>
> +<?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
> + xmlns:tns="http://bugs3290.cxf.apache.org/services/bug1"
> + xmlns:bug2="http://bugs3290.cxf.apache.org/services/bug2"
> + xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> + targetNamespace="http://bugs3290.cxf.apache.org/services/bug1"
> + name="bug1">
> +
> +<wsdl:import namespace="http://bugs3290.cxf.apache.org/services/bug2" location="bug2.wsdl" />
> +
> + <wsdl:binding name="myBug1PortSoapBinding" type="bug2:myBugService">
> + <soap:binding style="document"
> + transport="http://schemas.xmlsoap.org/soap/http" />
> +
> + <wsdl:operation name="myBug1">
> + <soap:operation style="document" />
> + <wsdl:input>
> + <soap:body use="literal" />
> + </wsdl:input>
> + <wsdl:output>
> + <soap:body use="literal" />
> + </wsdl:output>
> + </wsdl:operation>
> + </wsdl:binding>
> + <wsdl:service name="myBugService">
> + <wsdl:port name="myBug1" binding="tns:myBug1PortSoapBinding">
> + <soap:address location="http://REPLACE_WITH_HOST_INFO/myBug1" />
> + </wsdl:port>
> + </wsdl:service>
> +
> +</wsdl:definitions>
>
> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl (original)
> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl Tue Aug 14 13:22:20 2012
> @@ -1,65 +1,65 @@
> -<?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
> - xmlns:tns="http://bugs3290.cxf.apache.org/services/bug2"
> - xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
> - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> - targetNamespace="http://bugs3290.cxf.apache.org/services/bug2"
> - name="bug2">
> -
> - <wsdl:types>
> -
> - <schema xmlns="http://www.w3.org/2001/XMLSchema"
> - elementFormDefault="qualified" attributeFormDefault="qualified"
> - targetNamespace="http://bugs3290.cxf.apache.org/services/bug2">
> -
> - <xsd:complexType name="requestDataType">
> - <xsd:sequence>
> - <xsd:element name="myString1" type="xsd:string" />
> - </xsd:sequence>
> - </xsd:complexType>
> -
> - <xsd:complexType name="responseDataType">
> - <xsd:sequence>
> - <xsd:element name="myString2" type="xsd:string" />
> - </xsd:sequence>
> - </xsd:complexType>
> -
> - <element name="myBug1" type="tns:requestDataType" />
> - <element name="myBug1Response" type="tns:responseDataType" />
> - </schema>
> - </wsdl:types>
> -
> - <wsdl:message name="myBug1RequestMessage">
> - <wsdl:part name="parameters" element="tns:myBug1" />
> - </wsdl:message>
> - <wsdl:message name="myBug1ResponseMessage">
> - <wsdl:part name="parameters" element="tns:myBug1Response" />
> - </wsdl:message>
> -
> - <wsdl:portType name="myBugService">
> - <wsdl:operation name="myBug1">
> - <wsdl:input message="tns:myBug1RequestMessage" />
> - <wsdl:output message="tns:myBug1ResponseMessage" />
> - </wsdl:operation>
> - </wsdl:portType>
> -
> -</wsdl:definitions>
> +<?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
> + xmlns:tns="http://bugs3290.cxf.apache.org/services/bug2"
> + xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> + targetNamespace="http://bugs3290.cxf.apache.org/services/bug2"
> + name="bug2">
> +
> + <wsdl:types>
> +
> + <schema xmlns="http://www.w3.org/2001/XMLSchema"
> + elementFormDefault="qualified" attributeFormDefault="qualified"
> + targetNamespace="http://bugs3290.cxf.apache.org/services/bug2">
> +
> + <xsd:complexType name="requestDataType">
> + <xsd:sequence>
> + <xsd:element name="myString1" type="xsd:string" />
> + </xsd:sequence>
> + </xsd:complexType>
> +
> + <xsd:complexType name="responseDataType">
> + <xsd:sequence>
> + <xsd:element name="myString2" type="xsd:string" />
> + </xsd:sequence>
> + </xsd:complexType>
> +
> + <element name="myBug1" type="tns:requestDataType" />
> + <element name="myBug1Response" type="tns:responseDataType" />
> + </schema>
> + </wsdl:types>
> +
> + <wsdl:message name="myBug1RequestMessage">
> + <wsdl:part name="parameters" element="tns:myBug1" />
> + </wsdl:message>
> + <wsdl:message name="myBug1ResponseMessage">
> + <wsdl:part name="parameters" element="tns:myBug1Response" />
> + </wsdl:message>
> +
> + <wsdl:portType name="myBugService">
> + <wsdl:operation name="myBug1">
> + <wsdl:input message="tns:myBug1RequestMessage" />
> + <wsdl:output message="tns:myBug1ResponseMessage" />
> + </wsdl:operation>
> + </wsdl:portType>
> +
> +</wsdl:definitions>
>
> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl (original)
> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl Tue Aug 14 13:22:20 2012
> @@ -1,89 +1,89 @@
> -<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
> - <wsdl:types>
> - <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
> - <xsd:complexType name="loginrequesttype">
> - <xsd:sequence>
> - <xsd:element name="username" type="xsd:string"/>
> - <xsd:element name="password" type="xsd:string"/>
> - </xsd:sequence>
> - </xsd:complexType>
> - <xsd:complexType name="loginresponsetype">
> - <xsd:sequence>
> - <xsd:element name="userid" type="xsd:int"/>
> - <xsd:element name="groupid" type="xsd:int"/>
> - </xsd:sequence>
> - </xsd:complexType>
> -
> -
> - <xsd:element name="login">
> - <xsd:complexType>
> - <xsd:sequence>
> - <xsd:element name="login" type="fc:loginrequesttype"/>
> - <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
> - </xsd:sequence>
> - </xsd:complexType>
> - </xsd:element>
> - <xsd:element name="loginResponse">
> - <xsd:complexType>
> - <xsd:sequence>
> - <xsd:element name="login" type="fc:loginresponsetype"/>
> - <xsd:element name="password_temp" type="xsd:string"/>
> - </xsd:sequence>
> - </xsd:complexType>
> - </xsd:element>
> - </xsd:schema>
> - </wsdl:types>
> -
> - <wsdl:message name="loginRequest">
> - <wsdl:part name="parameters" element="fc:login"/>
> - </wsdl:message>
> - <wsdl:message name="loginResponse">
> - <wsdl:part name="parameters" element="fc:loginResponse"/>
> - </wsdl:message>
> -
> -
> - <wsdl:portType name="Login">
> - <wsdl:operation name="login">
> - <wsdl:input message="fc:loginRequest"/>
> - <wsdl:output message="fc:loginResponse"/>
> - </wsdl:operation>
> - </wsdl:portType>
> - <wsdl:binding name="Login" type="fc:Login">
> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
> -
> - <wsdl:operation name="login">
> - <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
> - <wsdl:input>
> - <soap:body use="literal"/>
> - </wsdl:input>
> - <wsdl:output>
> - <soap:body use="literal"/>
> - </wsdl:output>
> - </wsdl:operation>
> - </wsdl:binding>
> - <wsdl:service name="Login">
> - <wsdl:port binding="fc:Login" name="center">
> - <soap:address location="http://localhost:9000/"/>
> - </wsdl:port>
> - </wsdl:service>
> -
> +<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
> + <wsdl:types>
> + <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
> + <xsd:complexType name="loginrequesttype">
> + <xsd:sequence>
> + <xsd:element name="username" type="xsd:string"/>
> + <xsd:element name="password" type="xsd:string"/>
> + </xsd:sequence>
> + </xsd:complexType>
> + <xsd:complexType name="loginresponsetype">
> + <xsd:sequence>
> + <xsd:element name="userid" type="xsd:int"/>
> + <xsd:element name="groupid" type="xsd:int"/>
> + </xsd:sequence>
> + </xsd:complexType>
> +
> +
> + <xsd:element name="login">
> + <xsd:complexType>
> + <xsd:sequence>
> + <xsd:element name="login" type="fc:loginrequesttype"/>
> + <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
> + </xsd:sequence>
> + </xsd:complexType>
> + </xsd:element>
> + <xsd:element name="loginResponse">
> + <xsd:complexType>
> + <xsd:sequence>
> + <xsd:element name="login" type="fc:loginresponsetype"/>
> + <xsd:element name="password_temp" type="xsd:string"/>
> + </xsd:sequence>
> + </xsd:complexType>
> + </xsd:element>
> + </xsd:schema>
> + </wsdl:types>
> +
> + <wsdl:message name="loginRequest">
> + <wsdl:part name="parameters" element="fc:login"/>
> + </wsdl:message>
> + <wsdl:message name="loginResponse">
> + <wsdl:part name="parameters" element="fc:loginResponse"/>
> + </wsdl:message>
> +
> +
> + <wsdl:portType name="Login">
> + <wsdl:operation name="login">
> + <wsdl:input message="fc:loginRequest"/>
> + <wsdl:output message="fc:loginResponse"/>
> + </wsdl:operation>
> + </wsdl:portType>
> + <wsdl:binding name="Login" type="fc:Login">
> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
> +
> + <wsdl:operation name="login">
> + <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
> + <wsdl:input>
> + <soap:body use="literal"/>
> + </wsdl:input>
> + <wsdl:output>
> + <soap:body use="literal"/>
> + </wsdl:output>
> + </wsdl:operation>
> + </wsdl:binding>
> + <wsdl:service name="Login">
> + <wsdl:port binding="fc:Login" name="center">
> + <soap:address location="http://localhost:9000/"/>
> + </wsdl:port>
> + </wsdl:service>
> +
> </wsdl:definitions>
> \ No newline at end of file
>
> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml (original)
> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml Tue Aug 14 13:22:20 2012
> @@ -1,49 +1,49 @@
> -<?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.
> --->
> -<jaxws:bindings wsdlLocation="cxf3105.wsdl"
> - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
> - xmlns:xs="http://www.w3.org/2001/XMLSchema"
> - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> - xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
> - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> - xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
> - xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
> - http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
> - <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
> - <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
> - <jaxb:property name="LoginRequest"/>
> - </jaxb:bindings>
> - <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
> - <jaxb:property name="LoginResponse"/>
> - </jaxb:bindings>
> - <jaxb:bindings node="xs:element[@name='login']">
> - <jaxb:class name="LoginRequest"/>
> - </jaxb:bindings>
> - </jaxws:bindings>
> -
> -
> -
> - <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
> - <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
> - <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
> - </jaxws:bindings>
> -
> - <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
> -</jaxws:bindings>
> +<?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.
> +-->
> +<jaxws:bindings wsdlLocation="cxf3105.wsdl"
> + xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
> + xmlns:xs="http://www.w3.org/2001/XMLSchema"
> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> + xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> + xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
> + xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
> + http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
> + <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
> + <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
> + <jaxb:property name="LoginRequest"/>
> + </jaxb:bindings>
> + <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
> + <jaxb:property name="LoginResponse"/>
> + </jaxb:bindings>
> + <jaxb:bindings node="xs:element[@name='login']">
> + <jaxb:class name="LoginRequest"/>
> + </jaxb:bindings>
> + </jaxws:bindings>
> +
> +
> +
> + <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
> + <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
> + <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
> + </jaxws:bindings>
> +
> + <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
> +</jaxws:bindings>
>
>
--
Daniel Kulp
dkulp@apache.org - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com
Re: svn commit: r1372872 - in /cxf/branches/2.6.x-fixes: ./ api/src/main/resources/schemas/wsdl/ rt/databinding/sdo/src/main/resources/META-INF/ rt/rs/security/sso/saml/ rt/ws/mex/src/main/model/ tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290...
Posted by Daniel Kulp <dk...@apache.org>.
Something in the merge messed up and did a bunch of things it wasn't supposed to do… .on it.
Dan
On Aug 14, 2012, at 9:22 AM, dkulp@apache.org wrote:
> Author: dkulp
> Date: Tue Aug 14 13:22:20 2012
> New Revision: 1372872
>
> URL: http://svn.apache.org/viewvc?rev=1372872&view=rev
> Log:
> Merged revisions 1371581 via svn merge from
> https://svn.apache.org/repos/asf/cxf/trunk
>
> ........
> r1371581 | ffang | 2012-08-10 02:44:04 -0400 (Fri, 10 Aug 2012) | 1 line
>
> change svn properties for security/sso/saml folder
> ........
>
> Modified:
> cxf/branches/2.6.x-fixes/ (props changed)
> cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd
> cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml
> cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/ (props changed)
> cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd
> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl
> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl
> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
> cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml
>
> Propchange: cxf/branches/2.6.x-fixes/
> ('svn:mergeinfo' removed)
>
> Propchange: cxf/branches/2.6.x-fixes/
> ------------------------------------------------------------------------------
> Binary property 'svnmerge-integrated' - no diff available.
>
> Modified: cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd (original)
> +++ cxf/branches/2.6.x-fixes/api/src/main/resources/schemas/wsdl/swaref.xsd Tue Aug 14 13:22:20 2012
> @@ -1,25 +1,25 @@
> -<?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.
> --->
> -<xsd:schema targetNamespace="http://ws-i.org/profiles/basic/1.1/xsd"
> - xmlns:xsd="http://www.w3.org/2001/XMLSchema">
> - <xsd:simpleType name="swaRef">
> - <xsd:restriction base="xsd:anyURI" />
> - </xsd:simpleType>
> +<?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.
> +-->
> +<xsd:schema targetNamespace="http://ws-i.org/profiles/basic/1.1/xsd"
> + xmlns:xsd="http://www.w3.org/2001/XMLSchema">
> + <xsd:simpleType name="swaRef">
> + <xsd:restriction base="xsd:anyURI" />
> + </xsd:simpleType>
> </xsd:schema>
> \ No newline at end of file
>
> Modified: cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml (original)
> +++ cxf/branches/2.6.x-fixes/rt/databinding/sdo/src/main/resources/META-INF/tools-plugin.xml Tue Aug 14 13:22:20 2012
> @@ -1,24 +1,24 @@
> -<?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.
> --->
> -<plugin name="sdo" version="" provider="tuscany.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
> - <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> - <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> - <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> +<?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.
> +-->
> +<plugin name="sdo" version="" provider="tuscany.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
> + <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> + <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> + <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
> </plugin>
> \ No newline at end of file
>
> Propchange: cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/
> ------------------------------------------------------------------------------
> --- svn:ignore (original)
> +++ svn:ignore Tue Aug 14 13:22:20 2012
> @@ -1 +1,8 @@
> target
> +.pmd
> +.checkstyle
> +.ruleset
> +target
> +.settings
> +.classpath
> +.project
>
> Modified: cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd (original)
> +++ cxf/branches/2.6.x-fixes/rt/ws/mex/src/main/model/metadataexchange-2004-09.xsd Tue Aug 14 13:22:20 2012
> @@ -1,112 +1,112 @@
> -<?xml version='1.0' encoding='UTF-8' ?>
> -<!--
> -(c) 2004-2006 BEA Systems Inc., Computer Associates International, Inc.,
> -International Business Machines Corporation, Microsoft Corporation,
> -Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved.
> -
> -Permission to copy and display the WS-MetadataExchange Specification
> -(the "Specification"), in any medium without fee or royalty is hereby
> -granted, provided that you include the following on ALL copies of the
> -Specification that you make:
> -
> -1. A link or URL to the Specification at this location.
> -2. The copyright notice as shown in the Specification.
> -
> -BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
> -webMethods (collectively, the "Authors") each agree to grant you a
> -license, under royalty-free and otherwise reasonable,
> -non-discriminatory terms and conditions, to their respective essential
> -patent claims that they deem necessary to implement the
> -WS-MetadataExchange Specification.
> -
> -THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
> -REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
> -LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
> -PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
> -SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
> -IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
> -PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
> -
> -THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
> -INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
> -USE OR DISTRIBUTION OF THE SPECIFICATIONS.
> -
> -The name and trademarks of the Authors may NOT be used in any manner,
> -including advertising or publicity pertaining to the Specifications or
> -their contents without specific, written prior permission. Title to
> -copyright in the Specifications will at all times remain with the
> -Authors.
> -
> -No other rights are granted by implication, estoppel or otherwise.
> --->
> -
> -<xs:schema
> - targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
> - xmlns:tns='http://schemas.xmlsoap.org/ws/2004/09/mex'
> - xmlns:wsa10='http://www.w3.org/2005/08/addressing'
> - xmlns:wsa04='http://schemas.xmlsoap.org/ws/2004/08/addressing'
> - xmlns:xs='http://www.w3.org/2001/XMLSchema'
> - elementFormDefault='qualified'
> - blockDefault='#all' >
> -
> - <!-- Get Metadata request -->
> - <xs:element name='GetMetadata' >
> - <xs:complexType>
> - <xs:sequence>
> - <xs:element ref='tns:Dialect' minOccurs='0' />
> - <xs:element ref='tns:Identifier' minOccurs='0' />
> - </xs:sequence>
> - <xs:anyAttribute namespace='##other' processContents='lax' />
> - </xs:complexType>
> - </xs:element>
> -
> - <xs:element name='Dialect' type='xs:anyURI' />
> - <xs:element name='Identifier' type='xs:anyURI' />
> -
> - <!-- Get Metadata response -->
> - <xs:element name='Metadata' >
> - <xs:complexType>
> - <xs:sequence>
> - <xs:element ref='tns:MetadataSection'
> - minOccurs='0'
> - maxOccurs='unbounded' />
> - <xs:any namespace='##other' processContents='lax'
> - minOccurs='0'
> - maxOccurs='unbounded' />
> - </xs:sequence>
> - <xs:anyAttribute namespace='##other' processContents='lax' />
> - </xs:complexType>
> - </xs:element>
> -
> - <xs:element name='MetadataSection' >
> - <xs:complexType>
> - <xs:choice>
> - <xs:any namespace='##other' processContents='lax' />
> - <xs:element ref='tns:MetadataReference' />
> - <xs:element ref='tns:Location' />
> - </xs:choice>
> - <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
> - <xs:attribute name='Identifier' type='xs:anyURI' />
> - <xs:anyAttribute namespace='##other' processContents='lax' />
> - </xs:complexType>
> - </xs:element>
> -
> - <!--
> - Ideally, the type of the MetadataReference would have been
> - the union of wsa04:EndpointReferenceType and
> - wsa10:EndpointReferenceType but unfortunately xs:union only
> - works for simple types. As a result, we have to define
> - the mex:MetadataReference using xs:any.
> - -->
> -
> - <xs:element name='MetadataReference'>
> - <xs:complexType>
> - <xs:sequence>
> - <xs:any minOccurs='1' maxOccurs='unbounded'
> - processContents='lax' namespace='##other' />
> - </xs:sequence>
> - </xs:complexType>
> - </xs:element>
> - <xs:element name='Location'
> - type='xs:anyURI' />
> -</xs:schema>
> +<?xml version='1.0' encoding='UTF-8' ?>
> +<!--
> +(c) 2004-2006 BEA Systems Inc., Computer Associates International, Inc.,
> +International Business Machines Corporation, Microsoft Corporation,
> +Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved.
> +
> +Permission to copy and display the WS-MetadataExchange Specification
> +(the "Specification"), in any medium without fee or royalty is hereby
> +granted, provided that you include the following on ALL copies of the
> +Specification that you make:
> +
> +1. A link or URL to the Specification at this location.
> +2. The copyright notice as shown in the Specification.
> +
> +BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
> +webMethods (collectively, the "Authors") each agree to grant you a
> +license, under royalty-free and otherwise reasonable,
> +non-discriminatory terms and conditions, to their respective essential
> +patent claims that they deem necessary to implement the
> +WS-MetadataExchange Specification.
> +
> +THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
> +REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
> +LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
> +PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
> +SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
> +IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
> +PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
> +
> +THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
> +INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
> +USE OR DISTRIBUTION OF THE SPECIFICATIONS.
> +
> +The name and trademarks of the Authors may NOT be used in any manner,
> +including advertising or publicity pertaining to the Specifications or
> +their contents without specific, written prior permission. Title to
> +copyright in the Specifications will at all times remain with the
> +Authors.
> +
> +No other rights are granted by implication, estoppel or otherwise.
> +-->
> +
> +<xs:schema
> + targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
> + xmlns:tns='http://schemas.xmlsoap.org/ws/2004/09/mex'
> + xmlns:wsa10='http://www.w3.org/2005/08/addressing'
> + xmlns:wsa04='http://schemas.xmlsoap.org/ws/2004/08/addressing'
> + xmlns:xs='http://www.w3.org/2001/XMLSchema'
> + elementFormDefault='qualified'
> + blockDefault='#all' >
> +
> + <!-- Get Metadata request -->
> + <xs:element name='GetMetadata' >
> + <xs:complexType>
> + <xs:sequence>
> + <xs:element ref='tns:Dialect' minOccurs='0' />
> + <xs:element ref='tns:Identifier' minOccurs='0' />
> + </xs:sequence>
> + <xs:anyAttribute namespace='##other' processContents='lax' />
> + </xs:complexType>
> + </xs:element>
> +
> + <xs:element name='Dialect' type='xs:anyURI' />
> + <xs:element name='Identifier' type='xs:anyURI' />
> +
> + <!-- Get Metadata response -->
> + <xs:element name='Metadata' >
> + <xs:complexType>
> + <xs:sequence>
> + <xs:element ref='tns:MetadataSection'
> + minOccurs='0'
> + maxOccurs='unbounded' />
> + <xs:any namespace='##other' processContents='lax'
> + minOccurs='0'
> + maxOccurs='unbounded' />
> + </xs:sequence>
> + <xs:anyAttribute namespace='##other' processContents='lax' />
> + </xs:complexType>
> + </xs:element>
> +
> + <xs:element name='MetadataSection' >
> + <xs:complexType>
> + <xs:choice>
> + <xs:any namespace='##other' processContents='lax' />
> + <xs:element ref='tns:MetadataReference' />
> + <xs:element ref='tns:Location' />
> + </xs:choice>
> + <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
> + <xs:attribute name='Identifier' type='xs:anyURI' />
> + <xs:anyAttribute namespace='##other' processContents='lax' />
> + </xs:complexType>
> + </xs:element>
> +
> + <!--
> + Ideally, the type of the MetadataReference would have been
> + the union of wsa04:EndpointReferenceType and
> + wsa10:EndpointReferenceType but unfortunately xs:union only
> + works for simple types. As a result, we have to define
> + the mex:MetadataReference using xs:any.
> + -->
> +
> + <xs:element name='MetadataReference'>
> + <xs:complexType>
> + <xs:sequence>
> + <xs:any minOccurs='1' maxOccurs='unbounded'
> + processContents='lax' namespace='##other' />
> + </xs:sequence>
> + </xs:complexType>
> + </xs:element>
> + <xs:element name='Location'
> + type='xs:anyURI' />
> +</xs:schema>
>
> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl (original)
> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl Tue Aug 14 13:22:20 2012
> @@ -1,51 +1,51 @@
> -<?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
> - xmlns:tns="http://bugs3290.cxf.apache.org/services/bug1"
> - xmlns:bug2="http://bugs3290.cxf.apache.org/services/bug2"
> - xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
> - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> - targetNamespace="http://bugs3290.cxf.apache.org/services/bug1"
> - name="bug1">
> -
> -<wsdl:import namespace="http://bugs3290.cxf.apache.org/services/bug2" location="bug2.wsdl" />
> -
> - <wsdl:binding name="myBug1PortSoapBinding" type="bug2:myBugService">
> - <soap:binding style="document"
> - transport="http://schemas.xmlsoap.org/soap/http" />
> -
> - <wsdl:operation name="myBug1">
> - <soap:operation style="document" />
> - <wsdl:input>
> - <soap:body use="literal" />
> - </wsdl:input>
> - <wsdl:output>
> - <soap:body use="literal" />
> - </wsdl:output>
> - </wsdl:operation>
> - </wsdl:binding>
> - <wsdl:service name="myBugService">
> - <wsdl:port name="myBug1" binding="tns:myBug1PortSoapBinding">
> - <soap:address location="http://REPLACE_WITH_HOST_INFO/myBug1" />
> - </wsdl:port>
> - </wsdl:service>
> -
> -</wsdl:definitions>
> +<?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
> + xmlns:tns="http://bugs3290.cxf.apache.org/services/bug1"
> + xmlns:bug2="http://bugs3290.cxf.apache.org/services/bug2"
> + xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> + targetNamespace="http://bugs3290.cxf.apache.org/services/bug1"
> + name="bug1">
> +
> +<wsdl:import namespace="http://bugs3290.cxf.apache.org/services/bug2" location="bug2.wsdl" />
> +
> + <wsdl:binding name="myBug1PortSoapBinding" type="bug2:myBugService">
> + <soap:binding style="document"
> + transport="http://schemas.xmlsoap.org/soap/http" />
> +
> + <wsdl:operation name="myBug1">
> + <soap:operation style="document" />
> + <wsdl:input>
> + <soap:body use="literal" />
> + </wsdl:input>
> + <wsdl:output>
> + <soap:body use="literal" />
> + </wsdl:output>
> + </wsdl:operation>
> + </wsdl:binding>
> + <wsdl:service name="myBugService">
> + <wsdl:port name="myBug1" binding="tns:myBug1PortSoapBinding">
> + <soap:address location="http://REPLACE_WITH_HOST_INFO/myBug1" />
> + </wsdl:port>
> + </wsdl:service>
> +
> +</wsdl:definitions>
>
> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl (original)
> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl Tue Aug 14 13:22:20 2012
> @@ -1,65 +1,65 @@
> -<?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
> - xmlns:tns="http://bugs3290.cxf.apache.org/services/bug2"
> - xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
> - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> - targetNamespace="http://bugs3290.cxf.apache.org/services/bug2"
> - name="bug2">
> -
> - <wsdl:types>
> -
> - <schema xmlns="http://www.w3.org/2001/XMLSchema"
> - elementFormDefault="qualified" attributeFormDefault="qualified"
> - targetNamespace="http://bugs3290.cxf.apache.org/services/bug2">
> -
> - <xsd:complexType name="requestDataType">
> - <xsd:sequence>
> - <xsd:element name="myString1" type="xsd:string" />
> - </xsd:sequence>
> - </xsd:complexType>
> -
> - <xsd:complexType name="responseDataType">
> - <xsd:sequence>
> - <xsd:element name="myString2" type="xsd:string" />
> - </xsd:sequence>
> - </xsd:complexType>
> -
> - <element name="myBug1" type="tns:requestDataType" />
> - <element name="myBug1Response" type="tns:responseDataType" />
> - </schema>
> - </wsdl:types>
> -
> - <wsdl:message name="myBug1RequestMessage">
> - <wsdl:part name="parameters" element="tns:myBug1" />
> - </wsdl:message>
> - <wsdl:message name="myBug1ResponseMessage">
> - <wsdl:part name="parameters" element="tns:myBug1Response" />
> - </wsdl:message>
> -
> - <wsdl:portType name="myBugService">
> - <wsdl:operation name="myBug1">
> - <wsdl:input message="tns:myBug1RequestMessage" />
> - <wsdl:output message="tns:myBug1ResponseMessage" />
> - </wsdl:operation>
> - </wsdl:portType>
> -
> -</wsdl:definitions>
> +<?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
> + xmlns:tns="http://bugs3290.cxf.apache.org/services/bug2"
> + xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> + targetNamespace="http://bugs3290.cxf.apache.org/services/bug2"
> + name="bug2">
> +
> + <wsdl:types>
> +
> + <schema xmlns="http://www.w3.org/2001/XMLSchema"
> + elementFormDefault="qualified" attributeFormDefault="qualified"
> + targetNamespace="http://bugs3290.cxf.apache.org/services/bug2">
> +
> + <xsd:complexType name="requestDataType">
> + <xsd:sequence>
> + <xsd:element name="myString1" type="xsd:string" />
> + </xsd:sequence>
> + </xsd:complexType>
> +
> + <xsd:complexType name="responseDataType">
> + <xsd:sequence>
> + <xsd:element name="myString2" type="xsd:string" />
> + </xsd:sequence>
> + </xsd:complexType>
> +
> + <element name="myBug1" type="tns:requestDataType" />
> + <element name="myBug1Response" type="tns:responseDataType" />
> + </schema>
> + </wsdl:types>
> +
> + <wsdl:message name="myBug1RequestMessage">
> + <wsdl:part name="parameters" element="tns:myBug1" />
> + </wsdl:message>
> + <wsdl:message name="myBug1ResponseMessage">
> + <wsdl:part name="parameters" element="tns:myBug1Response" />
> + </wsdl:message>
> +
> + <wsdl:portType name="myBugService">
> + <wsdl:operation name="myBug1">
> + <wsdl:input message="tns:myBug1RequestMessage" />
> + <wsdl:output message="tns:myBug1ResponseMessage" />
> + </wsdl:operation>
> + </wsdl:portType>
> +
> +</wsdl:definitions>
>
> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl (original)
> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl Tue Aug 14 13:22:20 2012
> @@ -1,89 +1,89 @@
> -<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
> - <wsdl:types>
> - <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
> - <xsd:complexType name="loginrequesttype">
> - <xsd:sequence>
> - <xsd:element name="username" type="xsd:string"/>
> - <xsd:element name="password" type="xsd:string"/>
> - </xsd:sequence>
> - </xsd:complexType>
> - <xsd:complexType name="loginresponsetype">
> - <xsd:sequence>
> - <xsd:element name="userid" type="xsd:int"/>
> - <xsd:element name="groupid" type="xsd:int"/>
> - </xsd:sequence>
> - </xsd:complexType>
> -
> -
> - <xsd:element name="login">
> - <xsd:complexType>
> - <xsd:sequence>
> - <xsd:element name="login" type="fc:loginrequesttype"/>
> - <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
> - </xsd:sequence>
> - </xsd:complexType>
> - </xsd:element>
> - <xsd:element name="loginResponse">
> - <xsd:complexType>
> - <xsd:sequence>
> - <xsd:element name="login" type="fc:loginresponsetype"/>
> - <xsd:element name="password_temp" type="xsd:string"/>
> - </xsd:sequence>
> - </xsd:complexType>
> - </xsd:element>
> - </xsd:schema>
> - </wsdl:types>
> -
> - <wsdl:message name="loginRequest">
> - <wsdl:part name="parameters" element="fc:login"/>
> - </wsdl:message>
> - <wsdl:message name="loginResponse">
> - <wsdl:part name="parameters" element="fc:loginResponse"/>
> - </wsdl:message>
> -
> -
> - <wsdl:portType name="Login">
> - <wsdl:operation name="login">
> - <wsdl:input message="fc:loginRequest"/>
> - <wsdl:output message="fc:loginResponse"/>
> - </wsdl:operation>
> - </wsdl:portType>
> - <wsdl:binding name="Login" type="fc:Login">
> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
> -
> - <wsdl:operation name="login">
> - <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
> - <wsdl:input>
> - <soap:body use="literal"/>
> - </wsdl:input>
> - <wsdl:output>
> - <soap:body use="literal"/>
> - </wsdl:output>
> - </wsdl:operation>
> - </wsdl:binding>
> - <wsdl:service name="Login">
> - <wsdl:port binding="fc:Login" name="center">
> - <soap:address location="http://localhost:9000/"/>
> - </wsdl:port>
> - </wsdl:service>
> -
> +<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
> + <wsdl:types>
> + <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
> + <xsd:complexType name="loginrequesttype">
> + <xsd:sequence>
> + <xsd:element name="username" type="xsd:string"/>
> + <xsd:element name="password" type="xsd:string"/>
> + </xsd:sequence>
> + </xsd:complexType>
> + <xsd:complexType name="loginresponsetype">
> + <xsd:sequence>
> + <xsd:element name="userid" type="xsd:int"/>
> + <xsd:element name="groupid" type="xsd:int"/>
> + </xsd:sequence>
> + </xsd:complexType>
> +
> +
> + <xsd:element name="login">
> + <xsd:complexType>
> + <xsd:sequence>
> + <xsd:element name="login" type="fc:loginrequesttype"/>
> + <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
> + </xsd:sequence>
> + </xsd:complexType>
> + </xsd:element>
> + <xsd:element name="loginResponse">
> + <xsd:complexType>
> + <xsd:sequence>
> + <xsd:element name="login" type="fc:loginresponsetype"/>
> + <xsd:element name="password_temp" type="xsd:string"/>
> + </xsd:sequence>
> + </xsd:complexType>
> + </xsd:element>
> + </xsd:schema>
> + </wsdl:types>
> +
> + <wsdl:message name="loginRequest">
> + <wsdl:part name="parameters" element="fc:login"/>
> + </wsdl:message>
> + <wsdl:message name="loginResponse">
> + <wsdl:part name="parameters" element="fc:loginResponse"/>
> + </wsdl:message>
> +
> +
> + <wsdl:portType name="Login">
> + <wsdl:operation name="login">
> + <wsdl:input message="fc:loginRequest"/>
> + <wsdl:output message="fc:loginResponse"/>
> + </wsdl:operation>
> + </wsdl:portType>
> + <wsdl:binding name="Login" type="fc:Login">
> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
> +
> + <wsdl:operation name="login">
> + <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
> + <wsdl:input>
> + <soap:body use="literal"/>
> + </wsdl:input>
> + <wsdl:output>
> + <soap:body use="literal"/>
> + </wsdl:output>
> + </wsdl:operation>
> + </wsdl:binding>
> + <wsdl:service name="Login">
> + <wsdl:port binding="fc:Login" name="center">
> + <soap:address location="http://localhost:9000/"/>
> + </wsdl:port>
> + </wsdl:service>
> +
> </wsdl:definitions>
> \ No newline at end of file
>
> Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml
> URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml?rev=1372872&r1=1372871&r2=1372872&view=diff
> ==============================================================================
> --- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml (original)
> +++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml Tue Aug 14 13:22:20 2012
> @@ -1,49 +1,49 @@
> -<?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.
> --->
> -<jaxws:bindings wsdlLocation="cxf3105.wsdl"
> - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
> - xmlns:xs="http://www.w3.org/2001/XMLSchema"
> - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> - xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
> - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> - xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
> - xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
> - http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
> - <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
> - <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
> - <jaxb:property name="LoginRequest"/>
> - </jaxb:bindings>
> - <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
> - <jaxb:property name="LoginResponse"/>
> - </jaxb:bindings>
> - <jaxb:bindings node="xs:element[@name='login']">
> - <jaxb:class name="LoginRequest"/>
> - </jaxb:bindings>
> - </jaxws:bindings>
> -
> -
> -
> - <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
> - <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
> - <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
> - </jaxws:bindings>
> -
> - <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
> -</jaxws:bindings>
> +<?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.
> +-->
> +<jaxws:bindings wsdlLocation="cxf3105.wsdl"
> + xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
> + xmlns:xs="http://www.w3.org/2001/XMLSchema"
> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> + xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> + xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
> + xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
> + http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
> + <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
> + <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
> + <jaxb:property name="LoginRequest"/>
> + </jaxb:bindings>
> + <jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
> + <jaxb:property name="LoginResponse"/>
> + </jaxb:bindings>
> + <jaxb:bindings node="xs:element[@name='login']">
> + <jaxb:class name="LoginRequest"/>
> + </jaxb:bindings>
> + </jaxws:bindings>
> +
> +
> +
> + <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
> + <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
> + <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
> + </jaxws:bindings>
> +
> + <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
> +</jaxws:bindings>
>
>
--
Daniel Kulp
dkulp@apache.org - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com