Fix retrieval of bundles

Author: Yasin Dilekçi

src/main/java/nl/isaac/dotcms/plugin/configuration/ConfigurationService.java

@@ -18,8 +18,8 @@
 import org.apache.commons.configuration.DefaultConfigurationBuilder.ConfigurationProvider;
 import org.apache.commons.configuration.FileConfiguration;
 import org.apache.commons.lang.text.StrLookup;
+import org.apache.felix.framework.OSGIUtil;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
 
 import com.dotmarketing.util.Logger;
 
@@ -225,7 +225,7 @@ private static CustomConfiguration retrieveFromCacheOrCreateConfiguration(String
 
 			if (splitPluginName.length > 2) {
 				long bundleId = Long.valueOf(splitPluginName[2]);
-				bundle = FrameworkUtil.getBundle(ConfigurationService.class).getBundleContext().getBundle(bundleId);
+				bundle = OSGIUtil.getInstance().getBundle(bundleId);
 			} else {
 				// If we didn't get a bundleId we need to search for it, somewhat slower, but the result is cached
 				bundle = searchBundles(splitPluginName[1]);
@@ -286,7 +286,7 @@ private static CustomConfiguration retrieveFromCacheOrCreateConfiguration(String
 		return conf;
 	}
 	private static Bundle searchBundles(String pluginName) {
-		for (Bundle bundle : FrameworkUtil.getBundle(ConfigurationService.class).getBundleContext().getBundles()) {
+		for (Bundle bundle : OSGIUtil.getInstance().getBundles()) {
 			if (pluginName.equals(bundle.getHeaders().get("Bundle-Name"))) {
 				return bundle;
 			}

src/main/java/nl/isaac/dotcms/plugin/configuration/viewtool/portlet/admin/ConfigurationAdminViewTool.java

@@ -14,9 +14,9 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.felix.framework.OSGIUtil;
 import org.apache.velocity.tools.view.tools.ViewTool;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
 
 import com.dotmarketing.beans.Host;
 import com.dotmarketing.business.APILocator;
@@ -45,14 +45,15 @@ public List<String> getAllHosts() throws DotDataException, DotSecurityException
 
 	public List<String> getAllPlugins(String hostName, HttpServletRequest request) {
 		List<String> plugins = APILocator.getPluginAPI().getDeployedPluginOrder();
+
 		List<String> pluginNames = new ArrayList<>();
 		for (String pluginName : plugins) {
 			if (null != tryGetPluginConfiguration(hostName, pluginName, request)) {
 				pluginNames.add(pluginName);
 			}
 		}
 
-		for(Bundle bundle: FrameworkUtil.getBundle(getClass()).getBundleContext().getBundles()) {
+		for(Bundle bundle: OSGIUtil.getInstance().getBundles()) {
 			String bundleName = bundle.getHeaders().get("Bundle-Name");
 			if(!bundleName.contains(" ")) {
 				//Do not show dotCMS' own plugins like "Apache Felix Bundle Repository" etc

src/main/java/nl/isaac/dotcms/util/osgi/MonitoringServlet.java

@@ -11,10 +11,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.tools.view.context.ChainedContext;
 
-import com.dotcms.repackage.org.apache.commons.io.IOUtils;
 import com.dotmarketing.util.VelocityUtil;
 
 public class MonitoringServlet extends HttpServlet {