Skip to content

Commit 059b3b6

Browse files
author
Andreas Schaefer
committed
Merge branch 'develop'
# Conflicts: # Readme.md
2 parents c806860 + 8861768 commit 059b3b6

File tree

5 files changed

+120
-62
lines changed

5 files changed

+120
-62
lines changed

‎AEM IDE Tooling 4 IntelliJ.iml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,18 @@
1313
</content>
1414
<orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-171.4073.35" jdkType="IDEA JDK" />
1515
<orderEntry type="sourceFolder" forTests="false" />
16-
<orderEntry type="library" name="Maven: org.osgi:org.osgi.core:4.3.1" level="project" />
17-
<orderEntry type="library" name="org.osgi:org.osgi.compendium:4.3.1" level="project" />
18-
<orderEntry type="library" name="Maven: javax.jcr:jcr:2.0" level="project" />
19-
<orderEntry type="library" name="Maven: org.apache.jackrabbit:jackrabbit-api:2.4.0" level="project" />
20-
<orderEntry type="library" name="Maven: org.apache.jackrabbit:jackrabbit-core:2.4.0" level="project" />
21-
<orderEntry type="library" name="Maven: org.apache.jackrabbit:jackrabbit-jcr-commons:2.4.0" level="project" />
22-
<orderEntry type="library" name="Maven: org.apache.jackrabbit:jackrabbit-spi-commons:2.4.0" level="project" />
23-
<orderEntry type="library" name="Maven: org.apache.jackrabbit:jackrabbit-spi:2.4.0" level="project" />
24-
<orderEntry type="library" name="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault.rcp:3.0.0" level="project" />
25-
<orderEntry type="library" name="org.json:json:20140107" level="project" />
26-
<orderEntry type="library" name="commons-io:commons-io:2.4" level="project" />
27-
<orderEntry type="library" name="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.0.0" level="project" />
16+
<orderEntry type="library" name="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault.rcp:3.1.38" level="project" />
17+
<orderEntry type="library" name="org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.1.38" level="project" />
2818
<orderEntry type="library" name="Apache-Sling-IDE-trunk" level="project" />
2919
<orderEntry type="library" name="org.xhtmlrenderer:flying-saucer-core:9.1.1" level="project" />
3020
<orderEntry type="library" name="org.slf4j:slf4j-api:1.7.6" level="project" />
3121
<orderEntry type="library" name="Simple Logging Facade for Java:1.7.6" level="project" />
3222
<orderEntry type="library" name="org.slf4j:jcl-over-slf4j:1.7.6" level="project" />
3323
<orderEntry type="library" name="aemdc-with-dependencies" level="project" />
24+
<orderEntry type="library" name="javax-jcr-2.0" level="project" />
25+
<orderEntry type="library" name="org.osgi:org.osgi.framework:1.8.0" level="project" />
26+
<orderEntry type="library" name="org.osgi:org.osgi.service.event:1.3.1" level="project" />
27+
<orderEntry type="library" name="org.json:json:20140107" level="project" />
28+
<orderEntry type="library" name="org.osgi:org.osgi.compendium:4.3.1" level="project" />
3429
</component>
3530
</module>

‎META-INF/plugin.xml‎

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<idea-plugin version="2">
22
<id>com.headwire.aem.tooling.intellij</id>
33
<name>AEM IDE Tooling 4 IntelliJ</name>
4-
<version>1.0.1</version>
4+
<version>1.0.3.1</version>
55
<vendor email="aemintellijplugin@headwire.com" url="https://www.headwire.com/aemintellijplugin">headwire.com Inc</vendor>
66

77
<description><![CDATA[
@@ -16,6 +16,38 @@
1616

1717
<change-notes><![CDATA[
1818
<ul>
19+
<li>1.0.3.1:
20+
<ol>
21+
<li>
22+
Book keeping release
23+
</li>
24+
</ol>
25+
</li>
26+
<li>1.0.3:
27+
<ol>
28+
<li>
29+
Fix an issue with the Mac OS X High Sierra class loading crashes
30+
</li>
31+
</ol>
32+
</li>
33+
<li>1.0.2:
34+
<ol>
35+
<li>
36+
Fixed a possible deadlock scenario when a Bundle is not deployed or has a symbolic
37+
name mismatch. Now the Dialog will show up after the Debug Connection is established.
38+
</li><li>
39+
'Import from' is not working correctly for .content.xml files (beforehand it was
40+
ignored).
41+
</li><li>
42+
Support of the Sling Tooling Support Bundle version 1.0.5-SNAPSHOT which is required
43+
for Sling 9 and up. Also the Configuration allows the user to configure the selection
44+
of the support versions even though for most parts the latest should work just fine.
45+
</li><li>
46+
Added a Configurable Bundle Deployment Retries and Wait Period so that a user can
47+
configure the deployment based on its connection speed to the server.
48+
</li>
49+
</ol>
50+
</li>
1951
<li>1.0.1:
2052
<ol>
2153
<li>
@@ -179,10 +211,10 @@
179211
<implementation-class>com.headwire.aem.tooling.intellij.eclipse.wrapper.SerializationManagerWrapper
180212
</implementation-class>
181213
</component>
182-
<component>
183-
<interface-class>org.apache.sling.ide.artifacts.EmbeddedArtifactLocator</interface-class>
184-
<implementation-class>com.headwire.aem.tooling.intellij.util.ArtifactsLocatorImpl</implementation-class>
185-
</component>
214+
<!--<component>-->
215+
<!--<interface-class>org.apache.sling.ide.artifacts.EmbeddedArtifactLocator</interface-class>-->
216+
<!--<implementation-class>com.headwire.aem.tooling.intellij.util.ArtifactsLocatorImpl</implementation-class>-->
217+
<!--</component>-->
186218
<component>
187219
<interface-class>org.apache.sling.ide.filter.FilterLocator</interface-class>
188220
<implementation-class>com.headwire.aem.tooling.intellij.eclipse.wrapper.VltFilterLocatorWrapper
@@ -236,6 +268,10 @@
236268
<interface-class>com.headwire.aem.tooling.intellij.config.ModuleManager</interface-class>
237269
<implementation-class>com.headwire.aem.tooling.intellij.config.ModuleManagerImpl</implementation-class>
238270
</component>
271+
<component>
272+
<interface-class>org.apache.sling.ide.artifacts.EmbeddedArtifactLocator</interface-class>
273+
<implementation-class>com.headwire.aem.tooling.intellij.util.ArtifactsLocatorImpl</implementation-class>
274+
</component>
239275
<component>
240276
<implementation-class>com.headwire.aem.tooling.intellij.explorer.AemdcPanel</implementation-class>
241277
</component>

‎Readme.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This plugin requires to run IntelliJ IDEA **2016.2** or higher.
66

77
#### Releases:
88

9-
Release of 1.0.3 is out. Check out in the release section.
9+
Release of 1.0.3.1 is out. Check out in the release section.
1010

1111
New Releases can be found in the **Code -> Release** section on
1212
GitHub: [AEM Intellij Plugin](https://github.com/headwirecom/aem-ide-tooling-4-intellij)
@@ -29,12 +29,15 @@ The **master** is the latest release code and it the same as the highest
2929

3030
#### Updates:
3131

32+
**1.0.3.1**:
33+
* Book keeping release
34+
3235
**1.0.3**:
3336
* Fix an issue with Mac OS X High Sierra to load a class
3437

3538
**1.0.2**:
3639
* Fixed a possible deadlock scenario when a Bundle is not deployed or has a symbolic name mismatch. Now the Dialog will show up after the Debug Connection is established.
37-
* 'Import from' is not working correctly for .content.xml files (beforehand it was ignored).
40+
* 'Import from' is now working correctly for .content.xml files (beforehand it was ignored).
3841
* Support of the Sling Tooling Support Bundle version 1.0.5-SNAPSHOT which is required for Sling 9 and up.
3942
Also the Configuration allows the user to configure the selection
4043
of the support versions even though for most parts the latest should work just fine.

‎src/eclipse-fix/java/org/apache/sling/ide/impl/vlt/Activator.java‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎src/eclipse-fix/java/org/apache/sling/ide/impl/vlt/Activator2.java‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/*
2+
*
3+
* * Licensed to the Apache Software Foundation (ASF) under one or more
4+
* * contributor license agreements. See the NOTICE file distributed with
5+
* * this work for additional information regarding copyright ownership.
6+
* * The ASF licenses this file to You under the Apache License, Version 2.0
7+
* * (the "License"); you may not use this file except in compliance with
8+
* * the License. You may obtain a copy of the License at
9+
* *
10+
* * http://www.apache.org/licenses/LICENSE-2.0
11+
* *
12+
* * Unless required by applicable law or agreed to in writing, software
13+
* * distributed under the License is distributed on an "AS IS" BASIS,
14+
* * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* * See the License for the specific language governing permissions and
16+
* * limitations under the License.
17+
*
18+
*/
19+
20+
package org.apache.sling.ide.impl.vlt;
21+
22+
import org.apache.sling.ide.log.Logger;
23+
24+
import java.lang.reflect.InvocationTargetException;
25+
import java.lang.reflect.Method;
26+
27+
/**
28+
* Created by Andreas Schaefer (Headwire.com) on 5/15/15.
29+
*/
30+
public class Activator2 {
31+
32+
// The plug-in ID
33+
public static final String PLUGIN_ID = "org.apache.sling.ide.impl-vlt"; //$NON-NLS-1$
34+
35+
private static Activator2 instance = new Activator2();
36+
37+
public static Activator2 getDefault() {
38+
return instance;
39+
}
40+
41+
public Logger getPluginLogger() {
42+
Logger answer = null;
43+
// Use reflection to avoid runtime dependencies
44+
try {
45+
Class applicationManagerClass = Thread.currentThread().getContextClassLoader().loadClass("com.intellij.openapi.application.ApplicationManager");
46+
Method applicationMethod = applicationManagerClass.getDeclaredMethod("getApplication", null);
47+
Object application = applicationMethod.invoke(null, null);
48+
if(application != null) {
49+
Method componentMethod = application.getClass().getDeclaredMethod("getComponent", Class.class);
50+
answer = (Logger) componentMethod.invoke(application, Logger.class);
51+
}
52+
} catch(ClassNotFoundException e) {
53+
System.err.println("Could find Application Manager class");
54+
e.printStackTrace();
55+
} catch(NoSuchMethodException e) {
56+
System.err.println("Could find 'getApplication' or 'getComponent' method");
57+
e.printStackTrace();
58+
} catch(IllegalAccessException e) {
59+
System.err.println("Could not access 'getApplication' or 'getComponent' method");
60+
e.printStackTrace();
61+
} catch(InvocationTargetException e) {
62+
System.err.println("Could not invoke 'getApplication' or 'getComponent' method");
63+
e.printStackTrace();
64+
}
65+
return answer;
66+
}
67+
}

0 commit comments

Comments
 (0)