From 255f683e2b11f6e74a82acce92dab7e686f89b38 Mon Sep 17 00:00:00 2001 From: antelder 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 +++++++ .../META-INF/maven/archetype-metadata.xml | 21 +++++++- .../main/resources/META-INF/maven/archetype.xml | 21 +++++++- .../main/java/stripes/action/BaseActionBean.java | 18 +++++++ .../main/java/stripes/action/HomeActionBean.java | 18 +++++++ .../archetype-resources/src/main/webapp/index.html | 36 ++++++++++---- .../META-INF/maven/archetype-metadata.xml | 21 +++++++- .../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 +++++++ 17 files changed, 336 insertions(+), 42 deletions(-) (limited to 'branches/sca-java-2.0-M2/archetypes') 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 @@ - + + + src/main/java 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 @@ - + + + quickstart-stripes src\main\java\sample\stripes\action\BaseActionBean.java 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 = '\' ) - + - -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> - - - Hello World - - - - - - - - - - - - - - + +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> + + + Hello World + + + + + + + + + + + + + + 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"); + +<%@ 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 @@ + <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> 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 @@ - + + + src/main/java 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 @@ - + + + quickstart-stripes src\main\java\sample\stripes\action\BaseActionBean.java 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 = '\' ) - - - - - - +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) + + + + + + + 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 @@ - + + + src/main/java 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 @@ - + + + tuscany-quickstart src\main\java\HelloworldImpl.java 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 @@ + + 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 @@ +