1.0.3.5 - Migrated the Plugin to Services so that it works on current IDEA version and updated the Aemdc

It also contains a fix to handle bundle version checks for SNAPSHOTS and the handling of provided Symbolic Names using Plugin Facets

Author: Andreas Schaefer

.idea/encodings.xml

@@ -11,7 +11,7 @@
       <excludeFolder url="file://$MODULE_DIR$/eclipse.aem.tooling.generatedd.test.project" />
       <excludeFolder url="file://$MODULE_DIR$/src/main/java/com/headwire/aem/tooling/intellij/console/intellij" />
     </content>
-    <orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-182.4505.22" jdkType="IDEA JDK" />
+    <orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-193.5233.102" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault.rcp:3.1.38" level="project" />
     <orderEntry type="library" name="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.1.38" level="project" />

.idea/misc.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>com.headwire.aem.tooling.intellij</id>
     <name>AEM IDE Tooling 4 IntelliJ</name>
-    <version>1.0.3.4</version>
+    <version>1.0.3.5-beta</version>
     <vendor email="aemintellijplugin@headwire.com" url="https://www.headwire.com/aemintellijplugin">headwire.com Inc</vendor>
 
     <description><![CDATA[
@@ -16,6 +16,17 @@
 
     <change-notes><![CDATA[
         <ul>
+            <li>1.0.3.5-beta:
+                <ol>
+                    <li>
+                        Migrated the Plugin to work with IntelliJ Plugin services rather than components so that it
+                        works with the latest releases of IntelliJ.
+                    </li>
+                    <li>
+                        Updated to the latest Aemdc code base
+                    </li>
+                </ol>
+            </li>
             <li>1.0.3.4:
                 <ol>
                     <li>
@@ -154,99 +165,39 @@
                 order="last"
                 nonDefaultProject="false"
         />
-    </extensions>
 
-    <application-components>
-        <!-- Add your application components here -->
-        <!-- AS NOTE: Any Wrapper class (ending in Wrapper) are classes that mimic the OSGi binding of other services -->
-        <component>
-            <implementation-class>com.headwire.aem.tooling.intellij.console.ConsoleLog</implementation-class>
-        </component>
-        <component>
-            <interface-class>org.osgi.service.event.EventAdmin</interface-class>
-            <implementation-class>com.headwire.aem.tooling.intellij.eclipse.wrapper.EventAdminWrapper
-            </implementation-class>
-        </component>
-        <component>
-            <interface-class>org.apache.sling.ide.transport.RepositoryFactory</interface-class>
-            <implementation-class>com.headwire.aem.tooling.intellij.eclipse.wrapper.VltRepositoryFactoryWrapper
-            </implementation-class>
-        </component>
-        <component>
-            <interface-class>org.apache.sling.ide.osgi.OsgiClientFactory</interface-class>
-            <implementation-class>com.headwire.aem.tooling.intellij.eclipse.wrapper.OsgiClientFactoryWrapper
-            </implementation-class>
-        </component>
-        <component>
-            <interface-class>org.apache.sling.ide.serialization.SerializationManager</interface-class>
-            <implementation-class>com.headwire.aem.tooling.intellij.eclipse.wrapper.SerializationManagerWrapper
-            </implementation-class>
-        </component>
-        <!--<component>-->
-            <!--<interface-class>org.apache.sling.ide.artifacts.EmbeddedArtifactLocator</interface-class>-->
-            <!--<implementation-class>com.headwire.aem.tooling.intellij.util.ArtifactsLocatorImpl</implementation-class>-->
-        <!--</component>-->
-        <component>
-            <interface-class>org.apache.sling.ide.filter.FilterLocator</interface-class>
-            <implementation-class>com.headwire.aem.tooling.intellij.eclipse.wrapper.VltFilterLocatorWrapper
-            </implementation-class>
-        </component>
-        <component>
-            <interface-class>org.apache.sling.ide.impl.vlt.VaultFsLocator</interface-class>
-            <implementation-class>org.apache.sling.ide.impl.vlt.VaultFsLocatorImpl</implementation-class>
-        </component>
-        <component>
-            <interface-class>org.apache.sling.ide.log.Logger</interface-class>
-            <implementation-class>com.headwire.aem.tooling.intellij.eclipse.wrapper.PluginLoggerWrapper
-            </implementation-class>
-        </component>
-        <component>
-            <implementation-class>com.headwire.aem.tooling.intellij.config.general.AEMPluginConfiguration
-            </implementation-class>
-        </component>
+        <postStartupActivity implementation="com.headwire.aem.tooling.intellij.explorer.PluginStartupActivity"/>
 
-    </application-components>
+        <applicationService serviceImplementation="com.headwire.aem.tooling.intellij.config.general.AEMPluginConfiguration" />
+        <applicationService serviceImplementation="com.headwire.aem.tooling.intellij.console.ConsoleLog" />
+        <applicationService serviceInterface="org.osgi.service.event.EventAdmin"
+                            serviceImplementation="com.headwire.aem.tooling.intellij.eclipse.wrapper.EventAdminWrapper" />
+        <applicationService serviceInterface="org.apache.sling.ide.impl.vlt.VaultFsLocator"
+                            serviceImplementation="org.apache.sling.ide.impl.vlt.VaultFsLocatorImpl" />
+        <applicationService serviceInterface="org.apache.sling.ide.serialization.SerializationManager"
+                            serviceImplementation="com.headwire.aem.tooling.intellij.eclipse.wrapper.SerializationManagerWrapper" />
+        <applicationService serviceInterface="org.apache.sling.ide.transport.RepositoryFactory"
+                            serviceImplementation="com.headwire.aem.tooling.intellij.eclipse.wrapper.VltRepositoryFactoryWrapper" />
+        <applicationService serviceInterface="org.apache.sling.ide.osgi.OsgiClientFactory"
+                            serviceImplementation="com.headwire.aem.tooling.intellij.eclipse.wrapper.OsgiClientFactoryWrapper" />
+        <applicationService serviceInterface="org.apache.sling.ide.filter.FilterLocator"
+                            serviceImplementation="com.headwire.aem.tooling.intellij.eclipse.wrapper.VltFilterLocatorWrapper" />
+        <applicationService serviceInterface="org.apache.sling.ide.log.Logger"
+                            serviceImplementation="com.headwire.aem.tooling.intellij.eclipse.wrapper.PluginLoggerWrapper" />
 
-    <project-components>
-        <component>
-            <implementation-class>com.headwire.aem.tooling.intellij.communication.MessageManager</implementation-class>
-        </component>
-        <component>
-            <implementation-class>com.headwire.aem.tooling.intellij.explorer.SlingServerTreeSelectionHandler
-            </implementation-class>
-        </component>
-        <component>
-            <implementation-class>com.headwire.aem.tooling.intellij.explorer.SlingServerTreeManager
-            </implementation-class>
-        </component>
-        <component>
-            <implementation-class>com.headwire.aem.tooling.intellij.config.ServerConfigurationManager
-            </implementation-class>
-        </component>
-        <component>
-            <implementation-class>com.headwire.aem.tooling.intellij.communication.ServerConnectionManager
-            </implementation-class>
-        </component>
-        <component>
-            <implementation-class>com.headwire.aem.tooling.intellij.console.ConsoleLogProjectTracker
-            </implementation-class>
-        </component>
-        <component>
-            <implementation-class>com.headwire.aem.tooling.intellij.communication.ContentResourceChangeListener
-            </implementation-class>
-        </component>
-        <component>
-            <interface-class>com.headwire.aem.tooling.intellij.config.ModuleManager</interface-class>
-            <implementation-class>com.headwire.aem.tooling.intellij.config.ModuleManagerImpl</implementation-class>
-        </component>
-        <component>
-            <interface-class>org.apache.sling.ide.artifacts.EmbeddedArtifactLocator</interface-class>
-            <implementation-class>com.headwire.aem.tooling.intellij.util.ArtifactsLocatorImpl</implementation-class>
-        </component>
-        <component>
-            <implementation-class>com.headwire.aem.tooling.intellij.explorer.AemdcPanel</implementation-class>
-        </component>
-    </project-components>
+        <projectService serviceImplementation="com.headwire.aem.tooling.intellij.communication.MessageManager" />
+        <projectService serviceImplementation="com.headwire.aem.tooling.intellij.explorer.SlingServerTreeSelectionHandler" />
+        <projectService serviceImplementation="com.headwire.aem.tooling.intellij.explorer.SlingServerTreeManager" />
+        <projectService serviceImplementation="com.headwire.aem.tooling.intellij.communication.ServerConnectionManager" />
+        <projectService serviceImplementation="com.headwire.aem.tooling.intellij.config.ServerConfigurationManager" />
+        <projectService serviceImplementation="com.headwire.aem.tooling.intellij.console.ConsoleLogProjectTracker" />
+        <projectService serviceInterface="com.headwire.aem.tooling.intellij.config.ModuleManager"
+                        serviceImplementation="com.headwire.aem.tooling.intellij.config.ModuleManagerImpl" />
+        <projectService serviceInterface="org.apache.sling.ide.artifacts.EmbeddedArtifactLocator"
+                        serviceImplementation="com.headwire.aem.tooling.intellij.util.ArtifactsLocatorImpl" />
+        <projectService serviceImplementation="com.headwire.aem.tooling.intellij.communication.ContentResourceChangeListener" />
+        <projectService serviceImplementation="com.headwire.aem.tooling.intellij.explorer.AemdcPanel" />
+    </extensions>
 
     <actions>
         <!-- Add your actions here -->

.idea/modules.xml

@@ -48,6 +48,10 @@ The **master** is the latest release code and it the same as the highest
 
 #### Updates:
 
+**1.0.3.5-beta**
+* Migrated the Plugin to work with IntelliJ Plugin services rather than components so that it works with the latest releases of IntelliJ.
+* Updated to the latest Aemdc code base
+
 **1.0.3.4**:
 * A fix for the Import From User Action that fails because I cannot write from a
   User Action.

.idea/vcs.xml

@@ -83,7 +83,7 @@ Maven OSGi Bundle plugin will create bind / unbind methods based on the annotati
 
 8) Go back to the Preferences, Plugins and make sure it is listed there
 
-![IntelliJ with installed Felix SCR Annoation Processor](./img/1.4.IntelliJ.Preferences.Review.Felix.Plugin.png)
+![IntelliJ with installed Felix SCR Annotation Processor](./img/1.4.IntelliJ.Preferences.Review.Felix.Plugin.png)
 
 The **Felix OSGi Annotation Processor** hooks into the compilation process and at the end of it will handle the
 **Annotation** similar to what the Maven OSGi Bundle plugin does. So when the compilation concludes the created class has

AEM IDE Tooling 4 IntelliJ.iml

@@ -22,6 +22,7 @@
 import com.headwire.aem.tooling.intellij.util.ComponentProvider;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 
@@ -41,7 +42,7 @@ protected boolean isAvailable(AnActionEvent e) {
         boolean ret = false;
         Project project = e.getProject();
         if(project != null) {
-            final SlingServerTreeSelectionHandler selectionHandler = ComponentProvider.getComponent(project, SlingServerTreeSelectionHandler.class);
+            final SlingServerTreeSelectionHandler selectionHandler = ServiceManager.getService(project, SlingServerTreeSelectionHandler.class);
             ret = selectionHandler.getCurrentConfiguration() != null;
         }
         return ret;

META-INF/plugin.xml

@@ -24,6 +24,7 @@
 import com.headwire.aem.tooling.intellij.util.ComponentProvider;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -55,7 +56,7 @@ protected boolean prepareDeployment(@Nullable Project project, @Nullable final D
                 final SlingServerTreeSelectionHandler selectionHandler = getSelectionHandler(project);
                 ServerConfiguration serverConfiguration = selectionHandler.getCurrentConfiguration();
                 if(serverConfiguration != null) {
-                    AEMPluginConfiguration pluginConfiguration = ComponentProvider.getComponent(project, AEMPluginConfiguration.class);
+                    AEMPluginConfiguration pluginConfiguration = ServiceManager.getService(project, AEMPluginConfiguration.class);
                     String lastUsedServerConfiguration = pluginConfiguration != null ? pluginConfiguration.getLastUsedServerConfiguration() : "";
                     if(lastUsedServerConfiguration != null && lastUsedServerConfiguration.length() > 0 && !lastUsedServerConfiguration.equals(serverConfiguration.getName())) {
                         doPurge(project, progressHandler);