You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2022/08/12 14:29:38 UTC

[sling-maven-plugin] branch master updated: releng: some javadoc clarifications

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 2bc8dca  releng: some javadoc clarifications
2bc8dca is described below

commit 2bc8dca90959e0c1f784570359ec293b0b3a48e6
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Aug 12 16:29:08 2022 +0200

    releng: some javadoc clarifications
---
 src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java   | 2 +-
 src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java | 2 +-
 .../apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java | 2 +-
 .../maven/bundlesupport/fsresource/SlingInitialContentMounter.java    | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java
index 9547e14..a2dcac7 100644
--- a/src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java
+++ b/src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java
@@ -48,7 +48,7 @@ import org.apache.sling.maven.bundlesupport.fsresource.FileVaultXmlMounter;
 import org.apache.sling.maven.bundlesupport.fsresource.SlingInitialContentMounter;
 
 /**
- * Creates OSGi configurations for the
+ * Create OSGi configurations for the
  * <a href="https://sling.apache.org/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html">Apache Sling File System Resource Provider</a>.
  * @since 2.2.0
  */
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java
index 51d1a86..962887d 100644
--- a/src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java
+++ b/src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java
@@ -27,7 +27,7 @@ import org.apache.sling.maven.bundlesupport.fsresource.FileVaultXmlMounter;
 import org.apache.sling.maven.bundlesupport.fsresource.SlingInitialContentMounter;
 
 /**
- * Removes OSGi configurations for the 
+ * Remove OSGi configurations for the 
  * <a href="https://sling.apache.org/documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html">Apache Sling File System Resource Provider</a>.
  * @since 2.2.0
  */
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java
index 0a5a72d..c02c26a 100644
--- a/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java
+++ b/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java
@@ -49,7 +49,7 @@ import io.github.classgraph.ClassInfoList;
 import io.github.classgraph.ScanResult;
 
 /**
- * Build  <a href="http://sling.apache.org/documentation/the-sling-engine/adapters.html">adapter metadata (JSON)</a> for the Web Console Plugin at {@code /system/console/status-adapters} and
+ * Build <a href="http://sling.apache.org/documentation/the-sling-engine/adapters.html#implementing-adaptable">adapter metadata (JSON)</a> for the Web Console Plugin at {@code /system/console/status-adapters} and
  * {@code /system/console/adapters} from classes annotated with
  * <a href="https://github.com/apache/sling-adapter-annotations">adapter annotations</a>.
  */
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java b/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
index 4757307..fb340a4 100644
--- a/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
+++ b/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
@@ -160,15 +160,13 @@ public final class SlingInitialContentMounter {
 
     /**
      * Remove configurations from a running OSGi instance for initial content.
-     * @param targetUrl The web console base url
-     * @param bundleFile The artifact (bundle)
+     * @param targetUrl The web console base url (up to the parent resource of the affected bundle)
      * @throws MojoExecutionException Exception
      */
     public void unmount(final URI targetUrl) throws MojoExecutionException {
         log.info("Removing file system provider configurations...");
 
         // remove all current configs for this project
-        // TODO: something is weird here, as target URL only contains the base URL but not the actual bundle name
         final Map<String,FsResourceConfiguration> oldConfigs = helper.getCurrentConfigurations(targetUrl);
         helper.removeConfigurations(targetUrl, oldConfigs);
     }