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:14:34 UTC
[sling-org-apache-sling-feature-modelconverter] 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-modelconverter.git
The following commit(s) were added to refs/heads/master by this push:
new fa1562c Move extension constants to Extension class
fa1562c is described below
commit fa1562c0a5cf93cec5ea3d204e2142ae53b0ac68
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Nov 21 15:14:25 2018 +0100
Move extension constants to Extension class
---
.../modelconverter/FeatureToProvisioning.java | 5 ++-
.../modelconverter/ProvisioningToFeature.java | 40 +++++++++++-----------
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java b/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java
index 823b247..7dbb30d 100644
--- a/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java
+++ b/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java
@@ -46,7 +46,6 @@ import org.apache.sling.feature.Configurations;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
-import org.apache.sling.feature.FeatureConstants;
import org.apache.sling.feature.builder.BuilderContext;
import org.apache.sling.feature.builder.FeatureBuilder;
import org.apache.sling.feature.builder.FeatureProvider;
@@ -237,7 +236,7 @@ public class FeatureToProvisioning {
// extensions: content packages and repoinit
for(final Extension ext : extensions) {
- if ( FeatureConstants.EXTENSION_NAME_CONTENT_PACKAGES.equals(ext.getName()) ) {
+ if (Extension.EXTENSION_NAME_CONTENT_PACKAGES.equals(ext.getName())) {
for(final org.apache.sling.feature.Artifact cp : ext.getArtifacts() ) {
String[] extRunModes = runModes;
final ArtifactId id = cp.getId();
@@ -254,7 +253,7 @@ public class FeatureToProvisioning {
f.getOrCreateRunMode(extRunModes).getOrCreateArtifactGroup(20).add(newCP);
}
- } else if ( FeatureConstants.EXTENSION_NAME_REPOINIT.equals(ext.getName()) ) {
+ } else if (Extension.EXTENSION_NAME_REPOINIT.equals(ext.getName())) {
final Section section = new Section("repoinit");
if (ext.getType() == ExtensionType.TEXT) {
section.setContents(ext.getText());
diff --git a/src/main/java/org/apache/sling/feature/modelconverter/ProvisioningToFeature.java b/src/main/java/org/apache/sling/feature/modelconverter/ProvisioningToFeature.java
index 57cc85c..961b22a 100644
--- a/src/main/java/org/apache/sling/feature/modelconverter/ProvisioningToFeature.java
+++ b/src/main/java/org/apache/sling/feature/modelconverter/ProvisioningToFeature.java
@@ -16,13 +16,27 @@
*/
package org.apache.sling.feature.modelconverter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Bundles;
import org.apache.sling.feature.Configurations;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
-import org.apache.sling.feature.FeatureConstants;
import org.apache.sling.feature.io.file.ArtifactHandler;
import org.apache.sling.feature.io.file.ArtifactManager;
import org.apache.sling.feature.io.file.ArtifactManagerConfig;
@@ -44,21 +58,6 @@ import org.apache.sling.provisioning.model.io.ModelReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
/** Converter that converts the provisioning model to the feature model.
*/
public class ProvisioningToFeature {
@@ -303,7 +302,7 @@ public class ProvisioningToFeature {
variables.put(entry.getKey(), entry.getValue());
}
- Extension cpExtension = extensions.getByName(FeatureConstants.EXTENSION_NAME_CONTENT_PACKAGES);
+ Extension cpExtension = extensions.getByName(Extension.EXTENSION_NAME_CONTENT_PACKAGES);
for(final RunMode runMode : feature.getRunModes() ) {
for(final ArtifactGroup group : runMode.getArtifactGroups()) {
for(final Artifact artifact : group) {
@@ -316,7 +315,8 @@ public class ProvisioningToFeature {
if ( newArtifact.getId().getType().equals("zip") ) {
if ( cpExtension == null ) {
- cpExtension = new Extension(ExtensionType.ARTIFACTS, FeatureConstants.EXTENSION_NAME_CONTENT_PACKAGES, true);
+ cpExtension = new Extension(ExtensionType.ARTIFACTS,
+ Extension.EXTENSION_NAME_CONTENT_PACKAGES, true);
extensions.add(cpExtension);
}
cpExtension.getArtifacts().add(newArtifact);
@@ -386,10 +386,10 @@ public class ProvisioningToFeature {
}
if(repoinitText.length() > 0) {
- Extension repoExtension = extensions.getByName(FeatureConstants.EXTENSION_NAME_REPOINIT);
+ Extension repoExtension = extensions.getByName(Extension.EXTENSION_NAME_REPOINIT);
if ( repoExtension == null ) {
- repoExtension = new Extension(ExtensionType.JSON, FeatureConstants.EXTENSION_NAME_REPOINIT, true);
+ repoExtension = new Extension(ExtensionType.JSON, Extension.EXTENSION_NAME_REPOINIT, true);
extensions.add(repoExtension);
repoExtension.setJSON(textToJSON(repoinitText.toString()));
} else {