sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [sling-org-apache-sling-feature-analyser] 24/28: [Feature Model] Move constants from support module to feature module
Date Fri, 27 Apr 2018 09:53:40 GMT
This is an automated email from the ASF dual-hosted git repository.

davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git

commit cc2ff4d8344dc0b93680160e80ceb2f13f40a42e
Author: David Bosschaert <david.bosschaert@gmail.com>
AuthorDate: Thu Apr 26 09:50:10 2018 +0100

    [Feature Model] Move constants from support module to feature module
    
    EXTENSION_NAME_REPOINIT and EXTENSION_NAME_CONTENT_PACKAGES were moved
    from SlingConstants in feature-support to FeatureConstants in feature.
---
 .../scanner/impl/ContentPackagesExtensionScanner.java        | 12 ++++++------
 .../apache/sling/feature/scanner/impl/RepoInitScanner.java   |  7 ++++---
 2 files changed, 10 insertions(+), 9 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 4fc9fb6..e125ce0 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
@@ -16,17 +16,17 @@
  */
 package org.apache.sling.feature.scanner.impl;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Set;
-
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.Extension;
 import org.apache.sling.feature.ExtensionType;
+import org.apache.sling.feature.FeatureConstants;
 import org.apache.sling.feature.io.ArtifactManager;
 import org.apache.sling.feature.scanner.ContainerDescriptor;
 import org.apache.sling.feature.scanner.spi.ExtensionScanner;
-import org.apache.sling.feature.support.SlingConstants;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Set;
 
 public class ContentPackagesExtensionScanner implements ExtensionScanner {
 
@@ -44,7 +44,7 @@ public class ContentPackagesExtensionScanner implements ExtensionScanner
{
     public ContainerDescriptor scan(final Extension extension,
             final ArtifactManager artifactManager)
     throws IOException {
-        if (!SlingConstants.EXTENSION_NAME_CONTENT_PACKAGES.equals(extension.getName()) )
{
+        if (!FeatureConstants.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 3681ecf..e30e879 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
@@ -16,15 +16,16 @@
  */
 package org.apache.sling.feature.scanner.impl;
 
-import java.io.IOException;
-
 import org.apache.sling.feature.Extension;
 import org.apache.sling.feature.ExtensionType;
+import org.apache.sling.feature.FeatureConstants;
 import org.apache.sling.feature.io.ArtifactManager;
 import org.apache.sling.feature.scanner.ContainerDescriptor;
 import org.apache.sling.feature.scanner.spi.ExtensionScanner;
 import org.apache.sling.feature.support.SlingConstants;
 
+import java.io.IOException;
+
 public class RepoInitScanner implements ExtensionScanner {
 
     @Override
@@ -41,7 +42,7 @@ public class RepoInitScanner implements ExtensionScanner {
     public ContainerDescriptor scan(final Extension extension,
             final ArtifactManager artifactManager)
     throws IOException {
-        if (!SlingConstants.EXTENSION_NAME_REPOINIT.equals(extension.getName()) ) {
+        if (!FeatureConstants.EXTENSION_NAME_REPOINIT.equals(extension.getName()) ) {
             return null;
         }
         if ( extension.getType() != ExtensionType.TEXT ) {

-- 
To stop receiving notification emails like this one, please contact
davidb@apache.org.

Mime
View raw message