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

17 files changed, 336 insertions, 42 deletions

diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
index fc37b44271..01bb835c40 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/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-jsf/src/main/resources/META-INF/maven/archetype.xml b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
index ba6c054389..5dd8cb4ad4 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/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>quickstart-stripes</id>

   <sources>

     <source>src\main\java\sample\stripes\action\BaseActionBean.java</source>

diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
index c738b0e643..50753bc0ba 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
@@ -1,7 +1,7 @@
 #set( $symbol_pound = '#' )

 #set( $symbol_dollar = '$' )

 #set( $symbol_escape = '\' )

-<?xml version="1.0"?>

+<?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

@@ -10,17 +10,16 @@
  * 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.

+ * under the License.    

 -->

-

 <faces-config version="1.2" 

     xmlns="http://java.sun.com/xml/ns/javaee"

     xmlns:xi="http://www.w3.org/2001/XInclude"

diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
index 1334d73ac5..4a3197ec4f 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
@@ -1,19 +1,37 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
-    <head>
-        <title>Hello World</title>
-    </head>
-    <body>
-        <f:view>
-            <h:form id="mainForm">
-              <h:panelGrid columns="2">
-                <h:outputLabel for="name" value="Please enter your name" />
-                <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
-                <h:commandButton value="Press me" action="#{helloWorld.send}"/>
-                <h:messages showDetail="true" showSummary="false"/>
-              </h:panelGrid>
-            </h:form>
-        </f:view>
-    </body>
-</html>
+<!--

+ * 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.    

+-->

+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>

+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>

+<html>

+    <head>

+        <title>Hello World</title>

+    </head>

+    <body>

+        <f:view>

+            <h:form id="mainForm">

+              <h:panelGrid columns="2">

+                <h:outputLabel for="name" value="Please enter your name" />

+                <h:inputText id="name" value="#{helloWorld.name}" required="true"/>

+                <h:commandButton value="Press me" action="#{helloWorld.send}"/>

+                <h:messages showDetail="true" showSummary="false"/>

+              </h:panelGrid>

+            </h:form>

+        </f:view>

+    </body>

+</html>

diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
index a29c2284b1..768aa2408b 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
@@ -1,4 +1,22 @@
-<%@ page session="false"%>
-<%
-response.sendRedirect("helloWorld.jsf");
+<!--

+ * 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.    

+-->

+<%@ page session="false"%>

+<%

+response.sendRedirect("helloWorld.jsf");

 %>
\ No newline at end of file
diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
index b65a20583b..1c096f66c6 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
@@ -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.    

+-->

 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>

 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>

 <html>

diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml b/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
index fc37b44271..01bb835c40 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/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-stripes/src/main/resources/META-INF/maven/archetype.xml b/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
index ba6c054389..5dd8cb4ad4 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/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>quickstart-stripes</id>

   <sources>

     <source>src\main\java\sample\stripes\action\BaseActionBean.java</source>

diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java b/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
index e5e3149898..a17b4ab268 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
@@ -1,6 +1,24 @@
 #set( $symbol_pound = '#' )

 #set( $symbol_dollar = '$' )

 #set( $symbol_escape = '\' )

+/*

+ * 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}.stripes.action;

 

 import net.sourceforge.stripes.action.ActionBean;

diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java b/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
index e4473564b9..89d897f879 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
@@ -1,6 +1,24 @@
 #set( $symbol_pound = '#' )

 #set( $symbol_dollar = '$' )

 #set( $symbol_escape = '\' )

+/*

+ * 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}.stripes.action;

 

 import net.sourceforge.stripes.action.DefaultHandler;

diff --git a/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html b/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
index 070582d04c..a350f1e68a 100644
--- a/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ b/branches/sca-java-2.0-M2/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
@@ -1,9 +1,27 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="refresh" content="0;url=Home.htm">
-  </head>
-</html>
+#set( $symbol_pound = '#' )

+#set( $symbol_dollar = '$' )

+#set( $symbol_escape = '\' )

+<!--

+ * 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.    

+ -->

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

+<html>

+  <head>

+    <meta http-equiv="refresh" content="0;url=Home.htm">

+  </head>

+</html>

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}"