diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-04-06 13:50:12 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-04-06 13:50:12 +0000 |
| commit | 79d1bd23a674b4964ffc122cae5476e8ed0e174f (patch) | |
| tree | c0e63238a9d53898d8644efd3e27268c17b64e64 /redback-configuration/src | |
| parent | 61d4f7e5a94a8ee4af6406be4138f4f2b24440c7 (diff) | |
| download | archiva-79d1bd23a674b4964ffc122cae5476e8ed0e174f.tar.gz archiva-79d1bd23a674b4964ffc122cae5476e8ed0e174f.zip | |
redback-configuration module fix license headers
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310326 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'redback-configuration/src')
6 files changed, 64 insertions, 30 deletions
diff --git a/redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java b/redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java index 3e102a545..e460aae27 100644 --- a/redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java +++ b/redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java @@ -1,19 +1,22 @@ package org.codehaus.plexus.redback.configuration; /* - * Copyright 2001-2006 The Codehaus. + * 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 * - * Licensed 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 * - * 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. + * 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. */ import org.codehaus.plexus.evaluator.DefaultExpressionEvaluator; diff --git a/redback-configuration/src/main/resources/META-INF/spring-context.xml b/redback-configuration/src/main/resources/META-INF/spring-context.xml index dc655aa4b..26dbeeb6c 100644 --- a/redback-configuration/src/main/resources/META-INF/spring-context.xml +++ b/redback-configuration/src/main/resources/META-INF/spring-context.xml @@ -1,5 +1,4 @@ -<?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 @@ -9,7 +8,7 @@ ~ "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 + ~ 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 diff --git a/redback-configuration/src/main/resources/org/codehaus/plexus/redback/config-defaults.properties b/redback-configuration/src/main/resources/org/codehaus/plexus/redback/config-defaults.properties index 2f39eeaab..e28bf4b37 100644 --- a/redback-configuration/src/main/resources/org/codehaus/plexus/redback/config-defaults.properties +++ b/redback-configuration/src/main/resources/org/codehaus/plexus/redback/config-defaults.properties @@ -1,18 +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 # -# Copyright 2006 The Codehaus. -# -# Licensed 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. +# 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. # -------------------------------------------------------------------- # Application Configuration diff --git a/redback-configuration/src/test/resources/META-INF/spring-context.xml b/redback-configuration/src/test/resources/META-INF/spring-context.xml index 51d20fe68..e8ba916f3 100644 --- a/redback-configuration/src/test/resources/META-INF/spring-context.xml +++ b/redback-configuration/src/test/resources/META-INF/spring-context.xml @@ -1,5 +1,4 @@ -<?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 @@ -9,7 +8,7 @@ ~ "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 + ~ 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 diff --git a/redback-configuration/src/test/resources/props/test-another.properties b/redback-configuration/src/test/resources/props/test-another.properties index a6da534c2..f61a0fa25 100644 --- a/redback-configuration/src/test/resources/props/test-another.properties +++ b/redback-configuration/src/test/resources/props/test-another.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. email.smtp.host=127.0.2.2 test.value=foo test.expression=${org.codehaus.plexus.security.test.value}/bar diff --git a/redback-configuration/src/test/resources/props/test-overlaid.properties b/redback-configuration/src/test/resources/props/test-overlaid.properties index 7ec32de46..a6a0cecce 100644 --- a/redback-configuration/src/test/resources/props/test-overlaid.properties +++ b/redback-configuration/src/test/resources/props/test-overlaid.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. email.smtp.host=127.0.1.1 email.smtp.description=Testable Description #can't do this, it's appended |