Move OSGi caches to target directory

Author: ppkarwasz

log4j-osgi-test/pom.xml

@@ -136,6 +136,13 @@
     </dependency>
   </dependencies>
   <build>
+    <testResources>
+      <testResource>
+        <!-- Enable variable interpolation in resources -->
+        <filtering>true</filtering>
+        <directory>src/test/resources</directory>
+      </testResource>
+    </testResources>
     <plugins>
 
       <!--
@@ -192,6 +199,15 @@
         </configuration>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <configuration>
+          <!-- Property files must be encoded in ISO-8859-1 -->
+          <propertiesEncoding>ISO-8859-1</propertiesEncoding>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>

log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/OsgiRule.java

@@ -16,8 +16,11 @@
  */
 package org.apache.logging.log4j.osgi.tests;
 
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
+import java.util.stream.Collectors;
 import org.junit.rules.ExternalResource;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.launch.Framework;
@@ -29,7 +32,6 @@
 class OsgiRule extends ExternalResource {
 
     private final FrameworkFactory factory;
-
     private Framework framework;
 
     OsgiRule(final FrameworkFactory factory) {
@@ -51,18 +53,19 @@ protected void after() {
 
     @Override
     protected void before() throws Throwable {
-        final Map<String, String> configMap = new HashMap<>();
-        // 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();
+        try (final InputStream is = OsgiRule.class.getResourceAsStream("/osgi.properties")) {
+            final Properties props = new Properties();
+            props.load(is);
+            final Map<String, String> configMap = props.entrySet().stream()
+                    .collect(Collectors.toMap(
+                            e -> String.valueOf(e.getKey()),
+                            e -> String.valueOf(e.getValue()),
+                            (prev, next) -> next,
+                            HashMap::new));
+            framework = factory.newFramework(configMap);
+            framework.init();
+            framework.start();
+        }
     }
 
     public Framework getFramework() {

log4j-osgi-test/src/test/resources/osgi.properties

@@ -0,0 +1,25 @@
+#
+# 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.
+#
+org.osgi.framework.storage.clean = onFirstInit
+felix.log.level = 4
+eclipse.log.level = ALL
+# Hack to get the build working on Windows. Could try newer versions of Felix.
+felix.cache.locking = false
+# Location of `felix-cache` directory
+felix.cache.rootdir = @project.build.directory@
+# Location of Equinox's cache
+osgi.configuration.area= @project.build.directory@/equinox-cache