Updated for dotCMS version 22

Author: Yasin Dilekçi

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>nl.isaac.dotcms.plugin.configuration</groupId>
 	<artifactId>isaac-dotcms-configuration</artifactId>
-	<version>5.3.8.10-1</version>
+	<version>22.03.7-1</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -54,10 +54,10 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.7.0</version>
+				<version>3.11.0</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>11</source>
+					<target>11</target>
 				</configuration>
 			</plugin>
 
@@ -114,13 +114,18 @@
 		<dependency>
 			<groupId>com.dotcms</groupId>
 			<artifactId>dotcms</artifactId>
-			<version>5.3.8.10</version>
+			<version>22.03.7</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
 					<groupId>org.mockito</groupId>
 					<artifactId>mockito-core</artifactId>
 				</exclusion>
+				<!-- Exclude the following otherwise 22.03.7 will not build -->
+				<exclusion>
+					<groupId>com.sun.xml.ws</groupId>
+					<artifactId>jaxws-ri</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

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

@@ -19,8 +19,8 @@
 import org.apache.commons.configuration.FileConfiguration;
 import org.apache.commons.lang.text.StrLookup;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
 
-import com.dotmarketing.osgi.OSGIProxyServlet;
 import com.dotmarketing.util.Logger;
 
 import nl.isaac.comp.configuration.CustomConfiguration;
@@ -225,7 +225,7 @@ private static CustomConfiguration retrieveFromCacheOrCreateConfiguration(String
 
 			if (splitPluginName.length > 2) {
 				long bundleId = Long.valueOf(splitPluginName[2]);
-				bundle = OSGIProxyServlet.bundleContext.getBundle(bundleId);
+				bundle = FrameworkUtil.getBundle(ConfigurationService.class).getBundleContext().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 : OSGIProxyServlet.bundleContext.getBundles()) {
+		for (Bundle bundle : FrameworkUtil.getBundle(ConfigurationService.class).getBundleContext().getBundles()) {
 			if (pluginName.equals(bundle.getHeaders().get("Bundle-Name"))) {
 				return bundle;
 			}

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

@@ -16,12 +16,12 @@
 import org.apache.commons.configuration.ConfigurationException;
 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;
 import com.dotmarketing.exception.DotDataException;
 import com.dotmarketing.exception.DotSecurityException;
-import com.dotmarketing.osgi.OSGIProxyServlet;
 import com.dotmarketing.util.Logger;
 
 import nl.isaac.comp.configuration.CustomConfiguration;
@@ -52,7 +52,7 @@ public List<String> getAllPlugins(String hostName, HttpServletRequest request) {
 			}
 		}
 
-		for(Bundle bundle: OSGIProxyServlet.bundleContext.getBundles()) {
+		for(Bundle bundle: FrameworkUtil.getBundle(getClass()).getBundleContext().getBundles()) {
 			String bundleName = bundle.getHeaders().get("Bundle-Name");
 			if(!bundleName.contains(" ")) {
 				//Do not show dotCMS' own plugins like "Apache Felix Bundle Repository" etc