Repository: wicket Updated Branches: refs/heads/WICKET-5713-meta-inf-wicket [created] e4262674d
WICKET-5713 Move /wicket.properties to /META-INF/wicket/xyz.properties Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e4262674 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e4262674 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e4262674 Branch: refs/heads/WICKET-5713-meta-inf-wicket Commit: e4262674d6dd347fb51a1454c63e5f03ed5f135e Parents: 5837817 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Thu Oct 2 12:32:21 2014 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Thu Oct 2 12:32:21 2014 +0200 ---------------------------------------------------------------------- .../wicket/osgi/OsgiClashingPackagesTest.java | 2 +- .../java/org/apache/wicket/Application.java | 97 +++++++++++++++++--- .../java/org/apache/wicket/IInitializer.java | 7 +- .../wicket/settings/FrameworkSettings.java | 2 +- wicket-core/src/main/java/wicket.properties | 15 --- .../wicket/org.apache.wicket.core.properties | 15 +++ wicket-devutils/src/main/java/wicket.properties | 15 --- .../org.apache.wicket.devutils.properties | 15 +++ .../org.apache.wicket.atmosphere.properties | 15 +++ .../src/main/resources/wicket.properties | 15 --- .../src/main/java/wicket.properties | 15 --- .../org.apache.wicket.extensions.properties | 15 +++ wicket-jmx/src/main/java/wicket.properties | 15 --- .../wicket/org.apache.wicket.jmx.properties | 15 +++ .../org/apache/wicket/velocity/Initializer.java | 11 +-- wicket-velocity/src/main/java/wicket.properties | 15 --- .../org.apache.wicket.velocity.properties | 15 +++ 17 files changed, 184 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java ---------------------------------------------------------------------- diff --git a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java index 993c8d4..6672cc6 100644 --- a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java +++ b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java @@ -153,7 +153,7 @@ public class OsgiClashingPackagesTest extends Assert entryName.startsWith("META-INF/") || // ignore Wicket's IInitializer conf files - (entryName.startsWith("wicket") && entryName.endsWith(".properties")) + (entryName.startsWith("META-INF/wicket") && entryName.endsWith(".properties")) ) { return false; http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-core/src/main/java/org/apache/wicket/Application.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java index 999316d..f2fd258 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.java +++ b/wicket-core/src/main/java/org/apache/wicket/Application.java @@ -18,20 +18,25 @@ package org.apache.wicket; import java.io.IOException; import java.io.InputStream; +import java.net.JarURLConnection; +import java.net.URISyntaxException; import java.net.URL; import java.net.URLConnection; import java.util.Collections; +import java.util.Enumeration; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; -import org.apache.wicket.application.ComponentOnConfigureListenerCollection; import org.apache.wicket.application.ComponentInitializationListenerCollection; import org.apache.wicket.application.ComponentInstantiationListenerCollection; import org.apache.wicket.application.ComponentOnAfterRenderListenerCollection; import org.apache.wicket.application.ComponentOnBeforeRenderListenerCollection; +import org.apache.wicket.application.ComponentOnConfigureListenerCollection; import org.apache.wicket.application.HeaderContributorListenerCollection; import org.apache.wicket.application.IComponentInitializationListener; import org.apache.wicket.application.IComponentInstantiationListener; @@ -98,6 +103,8 @@ import org.apache.wicket.settings.ResourceSettings; import org.apache.wicket.settings.SecuritySettings; import org.apache.wicket.settings.StoreSettings; import org.apache.wicket.util.IProvider; +import org.apache.wicket.util.file.File; +import org.apache.wicket.util.file.Folder; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.io.Streams; import org.apache.wicket.util.lang.Args; @@ -469,39 +476,105 @@ public abstract class Application implements UnboundListener, IEventSink getSessionListeners().onUnbound(sessionId); } + /** + * Finds all /META-INF/wicket/**.properties files and registers any {@link org.apache.wicket.IInitializer}s + * found in them. + * + * @throws IOException When there is a problem reading the content of the properties file + * @throws URISyntaxException When the url to the properties file cannot be translated to a file system path + */ + private void collectWicketProperties() throws IOException, URISyntaxException + { + Iterator<URL> wicketResources = getApplicationSettings().getClassResolver().getResources("META-INF/wicket"); + while (wicketResources.hasNext()) + { + URL metaInfWicket = wicketResources.next(); + String protocol = metaInfWicket.getProtocol(); + + if ("jar".equals(protocol)) + { + URLConnection urlConnection = metaInfWicket.openConnection(); + JarURLConnection jarURLConnection = (JarURLConnection) urlConnection; + JarFile jarFile = jarURLConnection.getJarFile(); + Enumeration<JarEntry> jarEntries = jarFile.entries(); + while (jarEntries.hasMoreElements()) + { + JarEntry jarEntry = jarEntries.nextElement(); + String entryName = jarEntry.getName(); + if (entryName.startsWith("META-INF/wicket/") && entryName.endsWith(".properties")) + { + Properties properties = new Properties(); + try (InputStream jarEntryStream = jarFile.getInputStream(jarEntry)) + { + properties.load(jarEntryStream); + load(properties); + } + } + } + } + else if ("file".equals(protocol)) + { + Folder metaInfWicketFolder = new Folder(metaInfWicket.toURI()); + File[] files = metaInfWicketFolder.getFiles(new Folder.FileFilter() + { + @Override + public boolean accept(File file) + { + String fileName = file.getAbsolutePath(); + return fileName.contains("/META-INF/wicket/") && fileName.endsWith(".properties"); + } + }); + for (File wicketPropertiesFile : files) + { + Properties properties = new Properties(); + try (InputStream stream = wicketPropertiesFile.inputStream()) + { + properties.load(stream); + load(properties); + } + } + } + else + { + throw new WicketRuntimeException("Unknown protocol: " + protocol); + } + } + } /** * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL. * * Initializes wicket components. + * @deprecated This method will become 'private' in Wicket 8.x. And the support for /wicket.properties + * will be dropped */ + @Deprecated public final void initializeComponents() { // Load any wicket properties files we can find try { + collectWicketProperties(); + // Load properties files used by all libraries final Iterator<URL> resources = getApplicationSettings().getClassResolver() .getResources("wicket.properties"); while (resources.hasNext()) { - InputStream in = null; - try + final URL url = resources.next(); + log.warn("Found '{}'. /wicket.properties location is deprecated. Please move the file to" + + " /META-INF/wicket/ folder and give it a name that matches your packages' name," + + " e.g. com.example.myapp.properties", url); + final Properties properties = new Properties(); + try (InputStream in = Streams.readNonCaching(url)) { - final URL url = resources.next(); - final Properties properties = new Properties(); - in = Streams.readNonCaching(url); properties.load(in); load(properties); } - finally - { - IOUtils.close(in); - } } } - catch (IOException e) + catch (IOException | URISyntaxException e) { throw new WicketRuntimeException("Unable to load initializers file", e); } @@ -585,7 +658,7 @@ public abstract class Application implements UnboundListener, IEventSink { for (IInitializer initializer : initializers) { - log.info("[" + getName() + "] destroy: " + initializer); + log.info("[{}] destroy: {}", getName(), initializer); initializer.destroy(this); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-core/src/main/java/org/apache/wicket/IInitializer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/IInitializer.java b/wicket-core/src/main/java/org/apache/wicket/IInitializer.java index 26eb335..178b724 100644 --- a/wicket-core/src/main/java/org/apache/wicket/IInitializer.java +++ b/wicket-core/src/main/java/org/apache/wicket/IInitializer.java @@ -31,9 +31,10 @@ import org.apache.wicket.request.resource.PackageResource; * initialized lazily. * </p> * <p> - * Initializers can be configured by having a wicket.properties file in the class path root, with - * property 'initializer=${initializer class name}'. You can have one such properties per jar file, - * but the initializer that property denotes can delegate to other initializers of that library. + * Initializers can be configured by having a /META-INF/wicket/com.example.myapp.properties file in the + * class path root, with property 'initializer=${initializer class name}'. You can have one such + * properties per jar file, but the initializer that property denotes can delegate to other initializers + * of that library. * </p> * * @author Jonathan Locke http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-core/src/main/java/org/apache/wicket/settings/FrameworkSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/FrameworkSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/FrameworkSettings.java index 32663da..d193ca6 100644 --- a/wicket-core/src/main/java/org/apache/wicket/settings/FrameworkSettings.java +++ b/wicket-core/src/main/java/org/apache/wicket/settings/FrameworkSettings.java @@ -67,7 +67,7 @@ public class FrameworkSettings implements IEventDispatcher /** * Gets the Wicket version. The Wicket version is in the same format as the version element in * the pom.xml file (project descriptor). The version is generated by maven in the build/release - * cycle and put in the wicket.properties file located in the root folder of the Wicket jar. + * cycle and put in the /META-INF/MANIFEST.MF file located in the root folder of the Wicket jar. * * The version usually follows one of the following formats: * <ul> http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-core/src/main/java/wicket.properties ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/wicket.properties b/wicket-core/src/main/java/wicket.properties deleted file mode 100644 index d004034..0000000 --- a/wicket-core/src/main/java/wicket.properties +++ /dev/null @@ -1,15 +0,0 @@ -# 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. -initializer=org.apache.wicket.Initializer http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-core/src/main/resources/META-INF/wicket/org.apache.wicket.core.properties ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/resources/META-INF/wicket/org.apache.wicket.core.properties b/wicket-core/src/main/resources/META-INF/wicket/org.apache.wicket.core.properties new file mode 100644 index 0000000..d004034 --- /dev/null +++ b/wicket-core/src/main/resources/META-INF/wicket/org.apache.wicket.core.properties @@ -0,0 +1,15 @@ +# 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. +initializer=org.apache.wicket.Initializer http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-devutils/src/main/java/wicket.properties ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/wicket.properties b/wicket-devutils/src/main/java/wicket.properties deleted file mode 100644 index 406c79f..0000000 --- a/wicket-devutils/src/main/java/wicket.properties +++ /dev/null @@ -1,15 +0,0 @@ -# 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. -initializer=org.apache.wicket.devutils.debugbar.DebugBarInitializer \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-devutils/src/main/resources/META-INF/wicket/org.apache.wicket.devutils.properties ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/resources/META-INF/wicket/org.apache.wicket.devutils.properties b/wicket-devutils/src/main/resources/META-INF/wicket/org.apache.wicket.devutils.properties new file mode 100644 index 0000000..4c38496 --- /dev/null +++ b/wicket-devutils/src/main/resources/META-INF/wicket/org.apache.wicket.devutils.properties @@ -0,0 +1,15 @@ +# 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. +initializer=org.apache.wicket.devutils.debugbar.DebugBarInitializer http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-experimental/wicket-atmosphere/src/main/resources/META-INF/wicket/org.apache.wicket.atmosphere.properties ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/resources/META-INF/wicket/org.apache.wicket.atmosphere.properties b/wicket-experimental/wicket-atmosphere/src/main/resources/META-INF/wicket/org.apache.wicket.atmosphere.properties new file mode 100644 index 0000000..c07947f --- /dev/null +++ b/wicket-experimental/wicket-atmosphere/src/main/resources/META-INF/wicket/org.apache.wicket.atmosphere.properties @@ -0,0 +1,15 @@ +# 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. +initializer=org.apache.wicket.atmosphere.Initializer http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-experimental/wicket-atmosphere/src/main/resources/wicket.properties ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/resources/wicket.properties b/wicket-experimental/wicket-atmosphere/src/main/resources/wicket.properties deleted file mode 100644 index c07947f..0000000 --- a/wicket-experimental/wicket-atmosphere/src/main/resources/wicket.properties +++ /dev/null @@ -1,15 +0,0 @@ -# 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. -initializer=org.apache.wicket.atmosphere.Initializer http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-extensions/src/main/java/wicket.properties ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/wicket.properties b/wicket-extensions/src/main/java/wicket.properties deleted file mode 100644 index 7874436..0000000 --- a/wicket-extensions/src/main/java/wicket.properties +++ /dev/null @@ -1,15 +0,0 @@ -# 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. -initializer=org.apache.wicket.extensions.Initializer http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-extensions/src/main/resources/META-INF/wicket/org.apache.wicket.extensions.properties ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/resources/META-INF/wicket/org.apache.wicket.extensions.properties b/wicket-extensions/src/main/resources/META-INF/wicket/org.apache.wicket.extensions.properties new file mode 100644 index 0000000..7874436 --- /dev/null +++ b/wicket-extensions/src/main/resources/META-INF/wicket/org.apache.wicket.extensions.properties @@ -0,0 +1,15 @@ +# 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. +initializer=org.apache.wicket.extensions.Initializer http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-jmx/src/main/java/wicket.properties ---------------------------------------------------------------------- diff --git a/wicket-jmx/src/main/java/wicket.properties b/wicket-jmx/src/main/java/wicket.properties deleted file mode 100644 index 534efb7..0000000 --- a/wicket-jmx/src/main/java/wicket.properties +++ /dev/null @@ -1,15 +0,0 @@ -# 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. -initializer=org.apache.wicket.jmx.Initializer \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-jmx/src/main/resources/META-INF/wicket/org.apache.wicket.jmx.properties ---------------------------------------------------------------------- diff --git a/wicket-jmx/src/main/resources/META-INF/wicket/org.apache.wicket.jmx.properties b/wicket-jmx/src/main/resources/META-INF/wicket/org.apache.wicket.jmx.properties new file mode 100644 index 0000000..534efb7 --- /dev/null +++ b/wicket-jmx/src/main/resources/META-INF/wicket/org.apache.wicket.jmx.properties @@ -0,0 +1,15 @@ +# 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. +initializer=org.apache.wicket.jmx.Initializer \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java ---------------------------------------------------------------------- diff --git a/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java b/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java index 123f537..3a54e65 100644 --- a/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java +++ b/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java @@ -93,7 +93,7 @@ public class Initializer implements IInitializer WebApplicationPath webPath = new WebApplicationPath(servletContext, propertiesFolder); IResourceStream stream = webPath.find(Initializer.class, velocityPropertiesFile); - InputStream is = null; + InputStream is; try { is = stream.getInputStream(); @@ -101,15 +101,10 @@ public class Initializer implements IInitializer props.load(is); return props; } - catch (IOException e) + catch (IOException | ResourceStreamNotFoundException e) { throw new WicketRuntimeException(e); - } - catch (ResourceStreamNotFoundException e) - { - throw new WicketRuntimeException(e); - } - finally + } finally { try { http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-velocity/src/main/java/wicket.properties ---------------------------------------------------------------------- diff --git a/wicket-velocity/src/main/java/wicket.properties b/wicket-velocity/src/main/java/wicket.properties deleted file mode 100644 index 0b36808..0000000 --- a/wicket-velocity/src/main/java/wicket.properties +++ /dev/null @@ -1,15 +0,0 @@ -# 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. -initializer=org.apache.wicket.velocity.Initializer http://git-wip-us.apache.org/repos/asf/wicket/blob/e4262674/wicket-velocity/src/main/resources/META-INF/wicket/org.apache.wicket.velocity.properties ---------------------------------------------------------------------- diff --git a/wicket-velocity/src/main/resources/META-INF/wicket/org.apache.wicket.velocity.properties b/wicket-velocity/src/main/resources/META-INF/wicket/org.apache.wicket.velocity.properties new file mode 100644 index 0000000..0b36808 --- /dev/null +++ b/wicket-velocity/src/main/resources/META-INF/wicket/org.apache.wicket.velocity.properties @@ -0,0 +1,15 @@ +# 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. +initializer=org.apache.wicket.velocity.Initializer
