Author: kwin
Date: Thu Nov 3 08:55:00 2016
New Revision: 1767841
URL: http://svn.apache.org/viewvc?rev=1767841&view=rev
Log:
SLING-6112 point with the quick fixes to the new documentation page around
"Incremental Build Support"
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/AbstractBundleProjectConfigurator.java
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/BundleProjectNotSupportingM2EIncrementalBuildQuickFix.java
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/AbstractBundleProjectConfigurator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/AbstractBundleProjectConfigurator.java?rev=1767841&r1=1767840&r2=1767841&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/AbstractBundleProjectConfigurator.java
(original)
+++
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/AbstractBundleProjectConfigurator.java
Thu Nov 3 08:55:00 2016
@@ -67,7 +67,7 @@ public abstract class AbstractBundleProj
}
if (!isSupportingM2eIncrementalBuild(mavenProject, getLogger())) {
markerManager.addMarker(configRequest.getPom(),
MARKER_TYPE_BUNDLE_NOT_SUPPORTING_M2E,
- "Missing m2e incremental build support for generating the
bundle manifest, component descriptions and metatype resources. Please use the
provided QuickFixes on this issue to resolve this.",
+ "Missing m2e incremental build support for generating the
bundle manifest, component descriptions and metatype resources. Please use the
provided Quick Fixes on this issue to resolve this.",
-1,
IMarker.SEVERITY_ERROR);
}
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/BundleProjectNotSupportingM2EIncrementalBuildQuickFix.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/BundleProjectNotSupportingM2EIncrementalBuildQuickFix.java?rev=1767841&r1=1767840&r2=1767841&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/BundleProjectNotSupportingM2EIncrementalBuildQuickFix.java
(original)
+++
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/BundleProjectNotSupportingM2EIncrementalBuildQuickFix.java
Thu Nov 3 08:55:00 2016
@@ -45,51 +45,35 @@ import org.eclipse.ui.PlatformUI;
*/
public class BundleProjectNotSupportingM2EIncrementalBuildQuickFix implements
IMarkerResolutionGenerator {
+ private static final String DEFAULT_DESCRIPTION = "Further information on
how to configure the incremental build correctly is available in <a
href=\"http://sling.apache.org/documentation/development/ide-tooling/ide-tooling-incremental-build.html\";>http://sling.apache.org/documentation/development/ide-tooling/ide-tooling-incremental-build.html</a>";
+
@Override
public IMarkerResolution[] getResolutions(IMarker marker) {
// either suggest to use maven-bundle-project 3.2.0 with correct
configuration
- IMarkerResolution[] resolutions = new IMarkerResolution[3];
+ IMarkerResolution[] resolutions = new IMarkerResolution[2];
resolutions[0] = new InstallM2ETychoExtension();
- resolutions[1] = new FixUsingBndMavenPlugin();
- resolutions[2] = new FixUsingMBP320WithCorrectConfiguration();
+ resolutions[1] = new DescribeHowToConfigureMavenPluginsCorrectly();
return resolutions;
}
- public static final class FixUsingMBP320WithCorrectConfiguration
implements IMarkerResolution {
-
- FixUsingMBP320WithCorrectConfiguration() {
- }
-
- @Override
- public String getLabel() {
- return "Use maven-bundle-plugin 3.2.0 or newer with correct
configuration";
- }
+ public static final class DescribeHowToConfigureMavenPluginsCorrectly
implements IMarkerResolution {
- @Override
- public void run(IMarker marker) {
- MessageDialogWithLinkSection.openInformationWithLink(null,
- "Use maven-bundle-plugin 3.2.0 or newer with correct
configuration",
- "Please upgrade to at least maven-bundle-plugin 3.2.0 and
explicitly configure goal 'manifest' with configuration
'supportIncrementalBuild' and 'exportScr' set to 'true'.",
- "Further information is available at <a
href=\"http://felix.apache.org/documentation/faqs/apache-felix-bundle-plugin-faq.html#use-scr-metadata-generated-by-bnd-in-unit-tests\";>Maven
Bundle Plugin FAQ</a>, <a
href=\"https://issues.apache.org/jira/browse/FELIX-4009\";>FELIX-4009</a> and <a
href=\"https://issues.apache.org/jira/browse/https://issues.apache.org/jira/browse/FELIX-3324\";>https://issues.apache.org/jira/browse/FELIX-3324</a>");
- }
- }
-
- public static final class FixUsingBndMavenPlugin implements
IMarkerResolution {
+ private static final String LABEL = "Use more recent maven-plugins
with the right configuration";
- FixUsingBndMavenPlugin() {
+ DescribeHowToConfigureMavenPluginsCorrectly() {
}
@Override
public String getLabel() {
- return "Use bnd-maven-plugin in version 2.4.1 or newer";
+ return LABEL;
}
@Override
public void run(IMarker marker) {
MessageDialogWithLinkSection.openInformationWithLink(null,
- "Use bnd-maven-plugin 2.4.1 or newer",
- "Please use bnd-maven-plugin as this supports m2e
incremental builds correctly.",
- "Further information is available at <a
href=\"http://njbartlett.name/2015/03/27/announcing-bnd-maven-plugin.html\";>Blog
Post with Announcement</a>, <a
href=\"https://github.com/bndtools/bnd/issues/1180\";>issues-1180</a> and <a
href=\"https://github.com/bndtools/bnd/pull/1333\";>PR-1333</a>.");
+ LABEL,
+ "You need to configure the maven plugins appropriately and
maybe upgrade to a newer version.",
+ DEFAULT_DESCRIPTION);
}
}
