You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/02/07 17:12:13 UTC
logging-log4j2 git commit: Better test class name.
Repository: logging-log4j2
Updated Branches:
refs/heads/master a9e8f525a -> f8479bc53
Better test class name.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f8479bc5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f8479bc5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f8479bc5
Branch: refs/heads/master
Commit: f8479bc534f68a3a7cd1e1a9babc5d33a66aa805
Parents: a9e8f52
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Feb 7 10:12:08 2018 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Feb 7 10:12:08 2018 -0700
----------------------------------------------------------------------
.../log4j/osgi/tests/junit/OsgiRule.java | 77 --------------------
.../log4j/osgi/tests/junit/OsgiTestRule.java | 77 ++++++++++++++++++++
2 files changed, 77 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8479bc5/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
----------------------------------------------------------------------
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
deleted file mode 100644
index 6832157..0000000
--- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiRule.java
+++ /dev/null
@@ -1,77 +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.
- */
-
-package org.apache.logging.log4j.osgi.tests.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;
- }
-
- @Override
- protected void after() {
- if (framework != null) {
- try {
- framework.stop();
- } catch (final BundleException e) {
- throw new RuntimeException(e);
- } finally {
- framework = null;
- }
- }
- }
-
- @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");
- configMap.put("felix.log.level", "4");
- configMap.put("eclipse.log.level", "ALL");
- // Hack to get the build working on Windows. Could try newer versions of Felix.
- configMap.put("felix.cache.locking", "false");
- // 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();
- }
-
- public Framework getFramework() {
- return framework;
- }
-
- @Override
- public String toString() {
- return "OsgiRule [factory=" + factory + ", framework=" + framework + "]";
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8479bc5/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java
----------------------------------------------------------------------
diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java
new file mode 100644
index 0000000..6832157
--- /dev/null
+++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/junit/OsgiTestRule.java
@@ -0,0 +1,77 @@
+/*
+ * 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.osgi.tests.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;
+ }
+
+ @Override
+ protected void after() {
+ if (framework != null) {
+ try {
+ framework.stop();
+ } catch (final BundleException e) {
+ throw new RuntimeException(e);
+ } finally {
+ framework = null;
+ }
+ }
+ }
+
+ @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");
+ configMap.put("felix.log.level", "4");
+ configMap.put("eclipse.log.level", "ALL");
+ // Hack to get the build working on Windows. Could try newer versions of Felix.
+ configMap.put("felix.cache.locking", "false");
+ // 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();
+ }
+
+ public Framework getFramework() {
+ return framework;
+ }
+
+ @Override
+ public String toString() {
+ return "OsgiRule [factory=" + factory + ", framework=" + framework + "]";
+ }
+}