According to vim, you commited this using dos line endings. I thought we were converting to unix line endings?
---------- Forwarded message ---------- From: <ggreg...@apache.org> Date: 28 July 2016 at 19:34 Subject: logging-log4j2 git commit: Add toString(). To: comm...@logging.apache.org Repository: logging-log4j2 Updated Branches: refs/heads/master 7694f141b -> 5f9684ff4 Add toString(). Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5f9684ff Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5f9684ff Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5f9684ff Branch: refs/heads/master Commit: 5f9684ff4f77ef772c75eacafdbfb7fd957db40e Parents: 7694f14 Author: Gary Gregory <ggreg...@apache.org> Authored: Thu Jul 28 17:33:59 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Thu Jul 28 17:33:59 2016 -0700 ---------------------------------------------------------------------- .../apache/logging/log4j/junit/OsgiRule.java | 141 ++++++++++--------- 1 file changed, 73 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f9684ff/log4j-api/src/test/java/org/apache/logging/log4j/junit/OsgiRule.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/junit/OsgiRule.java b/log4j-api/src/test/java/org/apache/logging/log4j/junit/OsgiRule.java index f0378f0..8cd57f2 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/junit/OsgiRule.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/junit/OsgiRule.java @@ -1,68 +1,73 @@ -/* - * 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.logging.log4j.junit; - -import java.util.HashMap; -import java.util.Map; - -import org.junit.rules.ExternalResource; -import org.osgi.framework.BundleException; -import org.osgi.framework.launch.Framework; -import org.osgi.framework.launch.FrameworkFactory; - -/** - * JUnit rule to initialize and shutdown an OSGi framework. - */ -public class OsgiRule extends ExternalResource { - - private final FrameworkFactory factory; - private Framework framework; - - public OsgiRule(final FrameworkFactory factory) { - this.factory = factory; - } - - public Framework getFramework() { - return framework; - } - - @Override - protected void before() throws Throwable { - final Map<String, String> configMap = new HashMap<>(2); - // Cleans framework before first init. Subsequent init invocations do not clean framework. - configMap.put("org.osgi.framework.storage.clean", "onFirstInit"); - // Delegates loading of endorsed libraries to JVM classloader - // config.put("org.osgi.framework.bootdelegation", "javax.*,org.w3c.*,org.xml.*"); - framework = factory.newFramework(configMap); - framework.init(); - framework.start(); - } - - @Override - protected void after() { - if (framework != null) { - try { - framework.stop(); - } catch (final BundleException e) { - throw new RuntimeException(e); - } finally { - framework = null; - } - } - } -} +/* + * 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.logging.log4j.junit; + +import java.util.HashMap; +import java.util.Map; + +import org.junit.rules.ExternalResource; +import org.osgi.framework.BundleException; +import org.osgi.framework.launch.Framework; +import org.osgi.framework.launch.FrameworkFactory; + +/** + * JUnit rule to initialize and shutdown an OSGi framework. + */ +public class OsgiRule extends ExternalResource { + + private final FrameworkFactory factory; + private Framework framework; + + public OsgiRule(final FrameworkFactory factory) { + this.factory = factory; + } + + public Framework getFramework() { + return framework; + } + + @Override + protected void before() throws Throwable { + final Map<String, String> configMap = new HashMap<>(2); + // Cleans framework before first init. Subsequent init invocations do not clean framework. + configMap.put("org.osgi.framework.storage.clean", "onFirstInit"); + // Delegates loading of endorsed libraries to JVM classloader + // config.put("org.osgi.framework.bootdelegation", "javax.*,org.w3c.*,org.xml.*"); + framework = factory.newFramework(configMap); + framework.init(); + framework.start(); + } + + @Override + protected void after() { + if (framework != null) { + try { + framework.stop(); + } catch (final BundleException e) { + throw new RuntimeException(e); + } finally { + framework = null; + } + } + } + + @Override + public String toString() { + return "OsgiRule [factory=" + factory + ", framework=" + framework + "]"; + } +} -- Matt Sicker <boa...@gmail.com>
