sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject [sling-whiteboard] branch master updated: Rename process package to builder
Date Wed, 18 Apr 2018 07:34:20 GMT
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-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 2b4b1fd  Rename process package to builder
2b4b1fd is described below

commit 2b4b1fda83dba989fce3835bba3c270699d53bdc
Author: Carsten Ziegeler <cziegeler@apache.org>
AuthorDate: Wed Apr 18 09:34:13 2018 +0200

    Rename process package to builder
---
 .../feature/applicationbuilder/impl/ApplicationBuilderTest.java   | 6 +++---
 .../feature/{support/process => builder}/ApplicationBuilder.java  | 2 +-
 .../feature/{support/process => builder}/BuilderContext.java      | 2 +-
 .../sling/feature/{support/process => builder}/BuilderUtil.java   | 2 +-
 .../feature/{support/process => builder}/FeatureBuilder.java      | 2 +-
 .../{support/process => builder}/FeatureExtensionHandler.java     | 2 +-
 .../feature/{support/process => builder}/FeatureProvider.java     | 2 +-
 .../sling/feature/{support/process => builder}/package-info.java  | 2 +-
 .../main/java/org/apache/sling/feature/support/FeatureUtil.java   | 6 +++---
 .../feature/{support/process => builder}/BuilderUtilTest.java     | 6 +++---
 .../feature/{support/process => builder}/FeatureBuilderTest.java  | 8 ++++----
 .../main/java/org/apache/sling/feature/maven/Preprocessor.java    | 6 +++---
 12 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
b/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
index ee4bc13..524991c 100644
--- a/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
+++ b/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
@@ -39,6 +39,9 @@ import javax.json.stream.JsonGenerator;
 import org.apache.sling.feature.Application;
 import org.apache.sling.feature.ArtifactId;
 import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.builder.ApplicationBuilder;
+import org.apache.sling.feature.builder.BuilderContext;
+import org.apache.sling.feature.builder.FeatureProvider;
 import org.apache.sling.feature.resolver.FrameworkResolver;
 import org.apache.sling.feature.support.FeatureUtil;
 import org.apache.sling.feature.support.artifact.ArtifactHandler;
@@ -47,9 +50,6 @@ import org.apache.sling.feature.support.artifact.ArtifactManagerConfig;
 import org.apache.sling.feature.support.json.ApplicationJSONWriter;
 import org.apache.sling.feature.support.json.FeatureJSONReader;
 import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
-import org.apache.sling.feature.support.process.ApplicationBuilder;
-import org.apache.sling.feature.support.process.BuilderContext;
-import org.apache.sling.feature.support.process.FeatureProvider;
 import org.apache.sling.feature.support.resolver.FeatureResolver;
 import org.junit.After;
 import org.junit.Before;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/ApplicationBuilder.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/ApplicationBuilder.java
similarity index 99%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/ApplicationBuilder.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/ApplicationBuilder.java
index bac2486..e41dc94 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/ApplicationBuilder.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/ApplicationBuilder.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.feature.support.process;
+package org.apache.sling.feature.builder;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderContext.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/BuilderContext.java
similarity index 98%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderContext.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/BuilderContext.java
index baf04ae..ca3d82a 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderContext.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/BuilderContext.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.feature.support.process;
+package org.apache.sling.feature.builder;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderUtil.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java
similarity index 99%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderUtil.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java
index 87f5f86..b3f2c67 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/BuilderUtil.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.feature.support.process;
+package org.apache.sling.feature.builder;
 
 import java.io.StringReader;
 import java.util.Enumeration;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureBuilder.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureBuilder.java
similarity index 99%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureBuilder.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureBuilder.java
index e0475a4..8713ed4 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureBuilder.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureBuilder.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.feature.support.process;
+package org.apache.sling.feature.builder;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureExtensionHandler.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureExtensionHandler.java
similarity index 97%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureExtensionHandler.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureExtensionHandler.java
index df3497d..c92b742 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureExtensionHandler.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureExtensionHandler.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.feature.support.process;
+package org.apache.sling.feature.builder;
 
 import org.apache.sling.feature.Feature;
 
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureProvider.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureProvider.java
similarity index 95%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureProvider.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureProvider.java
index 350c222..4bffe15 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/FeatureProvider.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.feature.support.process;
+package org.apache.sling.feature.builder;
 
 import org.apache.sling.feature.ArtifactId;
 import org.apache.sling.feature.Feature;
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/package-info.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/package-info.java
similarity index 94%
rename from featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/package-info.java
rename to featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/package-info.java
index bf380fc..4ecbe60 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/process/package-info.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/package-info.java
@@ -18,6 +18,6 @@
  */
 
 @org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.feature.support.process;
+package org.apache.sling.feature.builder;
 
 
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
index 2ffb38f..4533973 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
@@ -26,13 +26,13 @@ import java.util.List;
 import org.apache.sling.feature.Application;
 import org.apache.sling.feature.ArtifactId;
 import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.builder.ApplicationBuilder;
+import org.apache.sling.feature.builder.BuilderContext;
+import org.apache.sling.feature.builder.FeatureProvider;
 import org.apache.sling.feature.support.artifact.ArtifactHandler;
 import org.apache.sling.feature.support.artifact.ArtifactManager;
 import org.apache.sling.feature.support.json.FeatureJSONReader;
 import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
-import org.apache.sling.feature.support.process.ApplicationBuilder;
-import org.apache.sling.feature.support.process.BuilderContext;
-import org.apache.sling.feature.support.process.FeatureProvider;
 import org.apache.sling.feature.support.resolver.FeatureResolver;
 import org.apache.sling.feature.support.resolver.FeatureResource;
 
diff --git a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/BuilderUtilTest.java
b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/builder/BuilderUtilTest.java
similarity index 96%
rename from featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/BuilderUtilTest.java
rename to featuremodel/feature-support/src/test/java/org/apache/sling/feature/builder/BuilderUtilTest.java
index cf76eb6..b5d3570 100644
--- a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/BuilderUtilTest.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/builder/BuilderUtilTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.feature.support.process;
+package org.apache.sling.feature.builder;
 
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.ArtifactId;
 import org.apache.sling.feature.Bundles;
-import org.apache.sling.feature.support.process.BuilderUtil;
-import org.apache.sling.feature.support.process.BuilderUtil.ArtifactMerge;
+import org.apache.sling.feature.builder.BuilderUtil;
+import org.apache.sling.feature.builder.BuilderUtil.ArtifactMerge;
 import org.junit.Test;
 
 import java.util.ArrayList;
diff --git a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/FeatureBuilderTest.java
b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/builder/FeatureBuilderTest.java
similarity index 98%
rename from featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/FeatureBuilderTest.java
rename to featuremodel/feature-support/src/test/java/org/apache/sling/feature/builder/FeatureBuilderTest.java
index ddb258b..af4a4b3 100644
--- a/featuremodel/feature-support/src/test/java/org/apache/sling/feature/support/process/FeatureBuilderTest.java
+++ b/featuremodel/feature-support/src/test/java/org/apache/sling/feature/builder/FeatureBuilderTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.feature.support.process;
+package org.apache.sling.feature.builder;
 
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.ArtifactId;
@@ -24,9 +24,9 @@ import org.apache.sling.feature.Feature;
 import org.apache.sling.feature.Include;
 import org.apache.sling.feature.OSGiCapability;
 import org.apache.sling.feature.OSGiRequirement;
-import org.apache.sling.feature.support.process.BuilderContext;
-import org.apache.sling.feature.support.process.FeatureBuilder;
-import org.apache.sling.feature.support.process.FeatureProvider;
+import org.apache.sling.feature.builder.BuilderContext;
+import org.apache.sling.feature.builder.FeatureBuilder;
+import org.apache.sling.feature.builder.FeatureProvider;
 import org.junit.Test;
 import org.osgi.resource.Capability;
 import org.osgi.resource.Requirement;
diff --git a/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
b/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
index 6c1a3ef..9d7f6b6 100644
--- a/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
+++ b/featuremodel/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
@@ -32,11 +32,11 @@ import org.apache.sling.feature.ArtifactId;
 import org.apache.sling.feature.Extension;
 import org.apache.sling.feature.ExtensionType;
 import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.builder.BuilderContext;
+import org.apache.sling.feature.builder.FeatureBuilder;
+import org.apache.sling.feature.builder.FeatureProvider;
 import org.apache.sling.feature.support.json.FeatureJSONReader;
 import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
-import org.apache.sling.feature.support.process.BuilderContext;
-import org.apache.sling.feature.support.process.FeatureBuilder;
-import org.apache.sling.feature.support.process.FeatureProvider;
 import org.codehaus.plexus.logging.Logger;
 
 /**

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

Mime
View raw message