Repository: wicket Updated Branches: refs/heads/WICKET-6194 eb730f297 -> fbac0708a
WICKET-6193 Add ASL2 headers Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/358e68f0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/358e68f0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/358e68f0 Branch: refs/heads/WICKET-6194 Commit: 358e68f075b315a5404db5eef4518e5201ed3a62 Parents: a6673f1 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sat Jul 2 13:28:46 2016 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sat Jul 2 13:28:46 2016 +0200 ---------------------------------------------------------------------- .../loader/NestedStringResourceLoader.java | 19 +++++++++++++++++-- .../loader/NestedStringResourceLoaderTest.java | 16 ++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/358e68f0/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java b/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java index dab0b92..e47a8be 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java @@ -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. + */ package org.apache.wicket.resource.loader; import java.util.ArrayList; @@ -10,7 +26,6 @@ import java.util.regex.Pattern; import org.apache.wicket.Application; import org.apache.wicket.Component; -import org.apache.wicket.resource.loader.IStringResourceLoader; import org.apache.wicket.settings.ResourceSettings; import org.apache.wicket.util.string.AppendingStringBuffer; @@ -178,4 +193,4 @@ public class NestedStringResourceLoader implements IStringResourceLoader } return replacedPlaceHolder; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/358e68f0/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java index 3a6b18b..4753331 100644 --- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/NestedStringResourceLoaderTest.java @@ -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. + */ package org.apache.wicket.resource.loader; import java.util.List;
