diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-06 08:36:12 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-06 08:36:12 +0000 |
| commit | f3771cd86a3b9a89c9c9b749c3601e2d9ce9439e (patch) | |
| tree | 7aacc6514dc812e6192ab98466f34088d8f4243e /branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src | |
| parent | 44b2a5dd3ed5070cf2d7000345a26ec778d46004 (diff) | |
Merge 832839 from trunk to m4 to fix files headers resulting from the 2.0-M4-RC2 review
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@833317 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src')
2 files changed, 33 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties index a23399569a..902842a19e 100644 --- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties +++ b/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties @@ -1,3 +1,19 @@ +# +# 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. +# # Resource strings used by the <stripes:errors> tag when there are no nested tags stripes.errors.header=<div style="color:#b72222; font-weight: bold">Please fix the following errors:</div><ol> diff --git a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties b/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties index 77fa204a15..2741999098 100644 --- a/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties +++ b/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties @@ -1,3 +1,20 @@ +# +# 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. +# + # log4j.properties # Set up a logger to the console |