Merge license header fixes from 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775855 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 200 insertions, 1 deletions

diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
index e472b2bada..4b5dffbcfa 100644
--- a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
+++ b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
 
 package org.example.orderservice;
 
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java
index 7508887a7d..76caa96d92 100644
--- a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java
+++ b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
 
 package org.example.orderservice;
 
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java
index a11d733cc9..f0d2b5caa1 100644
--- a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java
+++ b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
 
 package org.example.orderservice;
 
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
index 9c8ff711ea..4a394f2542 100644
--- a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
+++ b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
 
 package org.example.orderservice;
 
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
index 9e7192a0d0..f4c1add0dd 100644
--- a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
+++ b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
 
 package org.example.orderservice;
 
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
index 90dbc3f25e..4e7187522a 100644
--- a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
+++ b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
 
 package org.example.orderservice;
 
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java
index 73a1b5c45e..4c16ac26e6 100644
--- a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java
+++ b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
 
 package org.example.orderservice;
 
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java
index 64c056b7fb..ac03c52974 100644
--- a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java
+++ b/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java
@@ -1,2 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.example.org/OrderService/")
 package org.example.orderservice;
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl b/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl
index fd8ef74403..d016994679 100644
--- a/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl
+++ b/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<!--

+    * 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:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/OrderService/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="OrderService" targetNamespace="http://www.example.org/OrderService/">

     <wsdl:types>

         <xsd:schema targetNamespace="http://www.example.org/OrderService/">

diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index b77ea923d8..4d72db7e87 100644
--- a/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?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.    
+-->
 <web:web-app
 	xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
 	xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
index cfe63f359e..348be0df21 100644
--- a/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
@@ -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.    
+-->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
   <display-name>sample-store-secure-webapp</display-name>