From 255f683e2b11f6e74a82acce92dab7e686f89b38 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 26 Mar 2009 14:54:42 +0000
Subject: Merge trunk license header changes in r758666 to m2 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@758670 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/META-INF/maven/archetype-metadata.xml | 21 ++++++++++++++++++++-
 .../src/main/resources/META-INF/maven/archetype.xml | 21 ++++++++++++++++++++-
 .../src/main/resources/archetype-resources/pom.xml  | 19 +++++++++++++++++++
 .../src/main/java/HelloworldImpl.java               | 18 ++++++++++++++++++
 .../src/main/java/HelloworldService.java            | 18 ++++++++++++++++++
 .../src/main/webapp/WEB-INF/web.composite           | 18 ++++++++++++++++++
 6 files changed, 113 insertions(+), 2 deletions(-)

(limited to 'branches/sca-java-2.0-M2/archetypes/quickstart')

diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
index 1c1efacea8..239e554f93 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="myproject">
+<?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.    
+-->
+<archetype-descriptor name="myproject">
   <fileSets>
     <fileSet filtered="true" packaged="true" encoding="UTF-8">
       <directory>src/main/java</directory>
diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
index 3c37144ad1..0ce3e579f2 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?><archetype>
+<?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.    
+-->
+<archetype>
   <id>tuscany-quickstart</id>
   <sources>
     <source>src\main\java\HelloworldImpl.java</source>
diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 07ebbc9817..02dfcb35b9 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -1,3 +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.    
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
index b787f956c7..2491816adc 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.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 ${package};
 
 public class HelloworldImpl implements HelloworldService {
diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
index fa9fad6788..352c165731 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.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 ${package};
 
 public interface HelloworldService {
diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index cd443aed16..6294c7779a 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
@@ -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.    
+-->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
            targetNamespace="http://${package}"
-- 
cgit v1.2.3