Author: ay
Date: Sun Dec 23 21:48:01 2012
New Revision: 1425535
URL: http://svn.apache.org/viewvc?rev=1425535&view=rev
Log:
Merged revisions 1425534 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1425534 | ay | 2012-12-23 22:45:27 +0100 (Sun, 23 Dec 2012) | 1 line
fix the coding-mode for CXF-4723 xml files
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/greetMeWSAReq.xml
cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/greetMeWSAReqIn.xml
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/greetMeWSAReq.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/greetMeWSAReq.xml?rev=1425535&r1=1425534&r2=1425535&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/greetMeWSAReq.xml
(original)
+++
cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/greetMeWSAReq.xml
Sun Dec 23 21:48:01 2012
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";>
- <soap:Header>
- <Action
xmlns="http://www.w3.org/2005/08/addressing";>http://apache.org/hello_world_soap_http/Greeter/greetMeRequest</Action>
- <MessageID
xmlns="http://www.w3.org/2005/08/addressing";>urn:uuid:f40b7881-170e-455c-a78b-77d246fa7ac1</MessageID>
- <To
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:9002/SoapContext/SoapPort</To>
- <customer:CustomerKey xmlns="http://www.w3.org/2005/08/addressing";
xmlns:customer="http://example.org/customer";
xmlns:wsa="http://www.w3.org/2005/08/addressing";
wsa:IsReferenceParameter="1">Key#123456789</customer:CustomerKey>
- </soap:Header>
- <soap:Body>
- <greetMe xmlns="http://apache.org/hello_world_soap_http/types";>
- <requestType>implicit1</requestType>
- </greetMe>
- </soap:Body>
-</soap:Envelope>
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";>
+ <soap:Header>
+ <Action
xmlns="http://www.w3.org/2005/08/addressing";>http://apache.org/hello_world_soap_http/Greeter/greetMeRequest</Action>
+ <MessageID
xmlns="http://www.w3.org/2005/08/addressing";>urn:uuid:f40b7881-170e-455c-a78b-77d246fa7ac1</MessageID>
+ <To
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:9002/SoapContext/SoapPort</To>
+ <customer:CustomerKey xmlns="http://www.w3.org/2005/08/addressing";
xmlns:customer="http://example.org/customer";
xmlns:wsa="http://www.w3.org/2005/08/addressing";
wsa:IsReferenceParameter="1">Key#123456789</customer:CustomerKey>
+ </soap:Header>
+ <soap:Body>
+ <greetMe xmlns="http://apache.org/hello_world_soap_http/types";>
+ <requestType>implicit1</requestType>
+ </greetMe>
+ </soap:Body>
+</soap:Envelope>
Modified:
cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/greetMeWSAReqIn.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/greetMeWSAReqIn.xml?rev=1425535&r1=1425534&r2=1425535&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/greetMeWSAReqIn.xml
(original)
+++
cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/staxutils/resources/greetMeWSAReqIn.xml
Sun Dec 23 21:48:01 2012
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";>
- <soap:Header>
- <Action
xmlns="http://www.w3.org/2005/08/addressing";>http://apache.org/hello_world_soap_http/Greeter/greetMeRequest</Action>
- <MessageID
xmlns="http://www.w3.org/2005/08/addressing";>urn:uuid:f40b7881-170e-455c-a78b-77d246fa7ac1</MessageID>
- <To
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:9002/SoapContext/SoapPort</To>
- <ReplyTo xmlns="http://www.w3.org/2005/08/addressing";>
- <Address>http://localhost:9001/decoupled_endpoint</Address>
- </ReplyTo>
- <customer:CustomerKey xmlns="http://www.w3.org/2005/08/addressing";
xmlns:customer="http://example.org/customer";
xmlns:wsa="http://www.w3.org/2005/08/addressing";
wsa:IsReferenceParameter="1">Key#123456789</customer:CustomerKey>
- </soap:Header>
- <soap:Body>
- <greetMe xmlns="http://apache.org/hello_world_soap_http/types";>
- <requestType>implicit1</requestType>
- </greetMe>
- </soap:Body>
-</soap:Envelope>
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";>
+ <soap:Header>
+ <Action
xmlns="http://www.w3.org/2005/08/addressing";>http://apache.org/hello_world_soap_http/Greeter/greetMeRequest</Action>
+ <MessageID
xmlns="http://www.w3.org/2005/08/addressing";>urn:uuid:f40b7881-170e-455c-a78b-77d246fa7ac1</MessageID>
+ <To
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:9002/SoapContext/SoapPort</To>
+ <ReplyTo xmlns="http://www.w3.org/2005/08/addressing";>
+ <Address>http://localhost:9001/decoupled_endpoint</Address>
+ </ReplyTo>
+ <customer:CustomerKey xmlns="http://www.w3.org/2005/08/addressing";
xmlns:customer="http://example.org/customer";
xmlns:wsa="http://www.w3.org/2005/08/addressing";
wsa:IsReferenceParameter="1">Key#123456789</customer:CustomerKey>
+ </soap:Header>
+ <soap:Body>
+ <greetMe xmlns="http://apache.org/hello_world_soap_http/types";>
+ <requestType>implicit1</requestType>
+ </greetMe>
+ </soap:Body>
+</soap:Envelope>
