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
---
 .../META-INF/maven/archetype-metadata.xml          | 21 +++++++-
 .../main/resources/META-INF/maven/archetype.xml    | 21 +++++++-
 .../src/main/webapp/WEB-INF/faces-config.xml       |  9 ++--
 .../src/main/webapp/helloWorld.jsp                 | 56 ++++++++++++++--------
 .../archetype-resources/src/main/webapp/index.jsp  | 24 ++++++++--
 .../archetype-resources/src/main/webapp/page2.jsp  | 18 +++++++
 6 files changed, 120 insertions(+), 29 deletions(-)

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

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>
-- 
cgit v1.2.3