You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2018/11/21 14:03:04 UTC
[sling-org-apache-sling-feature-analyser] branch master updated:
Move extension constants to Extension class
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git
The following commit(s) were added to refs/heads/master by this push:
new 143ac52 Move extension constants to Extension class
143ac52 is described below
commit 143ac52c5b4e52a02a75cd4ad9551071d03b2e80
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Nov 21 15:02:54 2018 +0100
Move extension constants to Extension class
---
.../sling/feature/scanner/impl/ContentPackagesExtensionScanner.java | 5 ++---
.../java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
index cb2e16b..a3400dc 100644
--- a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
@@ -24,7 +24,6 @@ import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureConstants;
import org.apache.sling.feature.builder.ArtifactProvider;
import org.apache.sling.feature.scanner.ContainerDescriptor;
import org.apache.sling.feature.scanner.spi.ExtensionScanner;
@@ -33,7 +32,7 @@ public class ContentPackagesExtensionScanner implements ExtensionScanner {
@Override
public String getId() {
- return FeatureConstants.EXTENSION_NAME_CONTENT_PACKAGES;
+ return Extension.EXTENSION_NAME_CONTENT_PACKAGES;
}
@Override
@@ -46,7 +45,7 @@ public class ContentPackagesExtensionScanner implements ExtensionScanner {
final Extension extension,
final ArtifactProvider provider)
throws IOException {
- if (!FeatureConstants.EXTENSION_NAME_CONTENT_PACKAGES.equals(extension.getName()) ) {
+ if (!Extension.EXTENSION_NAME_CONTENT_PACKAGES.equals(extension.getName())) {
return null;
}
if ( extension.getType() != ExtensionType.ARTIFACTS ) {
diff --git a/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java b/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
index 1c7685b..818b6e8 100644
--- a/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
@@ -23,7 +23,6 @@ import org.apache.felix.utils.resource.RequirementImpl;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureConstants;
import org.apache.sling.feature.builder.ArtifactProvider;
import org.apache.sling.feature.scanner.ContainerDescriptor;
import org.apache.sling.feature.scanner.spi.ExtensionScanner;
@@ -36,7 +35,7 @@ public class RepoInitScanner implements ExtensionScanner {
@Override
public String getId() {
- return FeatureConstants.EXTENSION_NAME_REPOINIT;
+ return Extension.EXTENSION_NAME_REPOINIT;
}
@Override
@@ -49,7 +48,7 @@ public class RepoInitScanner implements ExtensionScanner {
final Extension extension,
final ArtifactProvider provider)
throws IOException {
- if (!FeatureConstants.EXTENSION_NAME_REPOINIT.equals(extension.getName()) ) {
+ if (!Extension.EXTENSION_NAME_REPOINIT.equals(extension.getName())) {
return null;
}
if ( extension.getType() != ExtensionType.TEXT ) {