Author: davsclaus
Date: Wed Jul 4 13:35:15 2012
New Revision: 1357258
URL: http://svn.apache.org/viewvc?rev=1357258&view=rev
Log:
Added missing license headers.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCustomerService.wsdl
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedResult.xml
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/request.xml
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/requestFault.xml
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/response.xml
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1357244
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java?rev=1357258&r1=1357257&r2=1357258&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java
Wed Jul 4 13:35:15 2012
@@ -21,6 +21,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import org.apache.camel.util.ObjectHelper;
+
public final class TestUtil {
private TestUtil() {
}
@@ -31,8 +33,19 @@ public final class TestUtil {
BufferedReader reader = new BufferedReader(new InputStreamReader(
is, "UTF-8"));
String line;
+ boolean comment = false;
while ((line = reader.readLine()) != null) {
- sb.append(line).append("\n");
+
+ // skip comments such as ASF license headers
+ if (line.startsWith("<!--")) {
+ comment = true;
+ } else if (line.startsWith("-->")) {
+ comment = false;
+ } else {
+ if (!comment) {
+ sb.append(line).append("\n");
+ }
+ }
}
return sb.toString();
} finally {
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl?rev=1357258&r1=1357257&r2=1357258&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService.wsdl
Wed Jul 4 13:35:15 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<wsdl:definitions name="CustomerServiceService"
targetNamespace="http://customerservice.example.com/";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:tns="http://customerservice.example.com/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl?rev=1357258&r1=1357257&r2=1357258&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/CustomerService2.wsdl
Wed Jul 4 13:35:15 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<wsdl:definitions name="CustomerServiceService"
targetNamespace="http://customerservice2.example.com/";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:tns="http://customerservice2.example.com/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";>
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:tns="http://customerservice2.example.com/";
attributeFormDefault="unqualified" elementFormDefault="unqualified"
targetNamespace="http://customerservice2.example.com/";>
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCustomerService.wsdl
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCustomerService.wsdl?rev=1357258&r1=1357257&r2=1357258&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCustomerService.wsdl
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/MultiPartCustomerService.wsdl
Wed Jul 4 13:35:15 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<wsdl:definitions name="CustomerServiceMultiPart"
targetNamespace="http://multipart.customerservice.example.com/";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:tns="http://multipart.customerservice.example.com/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml?rev=1357258&r1=1357257&r2=1357258&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedFault.xml
Wed Jul 4 13:35:15 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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.
+
+-->
<ns2:Envelope xmlns:ns2="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:ns3="http://customerservice.example.com/";>
<ns2:Body>
<ns2:Fault>
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedResult.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedResult.xml?rev=1357258&r1=1357257&r2=1357258&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedResult.xml
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/SoapMarshalTestExpectedResult.xml
Wed Jul 4 13:35:15 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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.
+
+-->
<ns2:Envelope xmlns:ns2="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:ns3="http://customerservice.example.com/";>
<ns2:Body>
<ns3:getCustomersByName>
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/request.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/request.xml?rev=1357258&r1=1357257&r2=1357258&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/request.xml
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/request.xml
Wed Jul 4 13:35:15 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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:Body>
<ns2:getCustomersByName
xmlns:ns2="http://customerservice.example.com/";>
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/requestFault.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/requestFault.xml?rev=1357258&r1=1357257&r2=1357258&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/requestFault.xml
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/requestFault.xml
Wed Jul 4 13:35:15 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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:Body>
<ns2:getCustomersByName
xmlns:ns2="http://customerservice.example.com/";>
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/response.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/response.xml?rev=1357258&r1=1357257&r2=1357258&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/response.xml
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/response.xml
Wed Jul 4 13:35:15 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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.
+
+-->
<ns2:Envelope xmlns:ns2="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:ns3="http://customerservice.example.com/";>
<ns2:Body>
<ns3:getCustomersByNameResponse>
Modified:
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml?rev=1357258&r1=1357257&r2=1357258&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml
(original)
+++
camel/branches/camel-2.9.x/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/responseFault.xml
Wed Jul 4 13:35:15 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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.
+
+-->
<ns2:Envelope xmlns:ns2="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:ns3="http://customerservice.example.com/";>
<ns2:Body>
<ns2:Fault>
