You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/11/24 20:50:52 UTC
[09/10] karaf git commit: Merge branch 'karaf-3982-propeditors' of
https://github.com/bimargulies/karaf
Merge branch 'karaf-3982-propeditors' of https://github.com/bimargulies/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a8394fb6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a8394fb6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a8394fb6
Branch: refs/heads/master
Commit: a8394fb6c80e894c77c505d7c1bd61bad3c039f8
Parents: 9ebb25a 6bc4817
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Nov 24 20:32:01 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Nov 24 20:32:01 2015 +0100
----------------------------------------------------------------------
.../standard/src/main/feature/feature.xml | 2 +
profile/pom.xml | 6 +
.../apache/karaf/profile/assembly/Builder.java | 25 +++
tooling/karaf-maven-plugin/pom.xml | 12 +-
.../src/it/test-assembly-prop-edits/pom.xml | 78 ++++++++++
.../src/main/karaf/assembly-property-edits.xml | 35 +++++
.../src/it/test-assembly-prop-edits/verify.bsh | 29 ++++
.../org/apache/karaf/tooling/AssemblyMojo.java | 64 +++++++-
.../karaf-maven-plugin/src/site/apt/usage.apt | 6 +-
.../xdoc/karaf-property-instructions-model.xml | 156 +++++++++++++++++++
tooling/pom.xml | 1 +
tooling/utils/pom.xml | 89 +++++++++++
.../org/apache/karaf/tools/utils/JoinUtil.java | 59 +++++++
.../apache/karaf/tools/utils/JoinableValue.java | 25 +++
.../tools/utils/KarafPropertiesEditor.java | 78 ++++++++++
.../karaf/tools/utils/KarafPropertiesFile.java | 107 +++++++++++++
tooling/utils/src/main/mdo/edits.mdo | 123 +++++++++++++++
.../tools/utils/KarafPropertiesEditorTest.java | 78 ++++++++++
.../org/apache/karaf/tools/utils/test-edits.xml | 52 +++++++
19 files changed, 1018 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a8394fb6/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a8394fb6/profile/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a8394fb6/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a8394fb6/tooling/karaf-maven-plugin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a8394fb6/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
----------------------------------------------------------------------
diff --cc tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
index 166999c,2f2f5c1..c083256
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java
@@@ -37,9 -42,16 +42,16 @@@ import java.util.ArrayList
import java.util.List;
/**
- * Installs kar dependencies into a server-under-construction in target/assembly
+ * Creates a customized Karaf distribution by installing features and setting up
+ * configuration files. The plugin gets features from feature.xml files and KAR
+ * archives declared as dependencies or as files configured with the
+ * featureRespositories parameter. It picks up other files, such as config files,
+ * from ${project.build.directory}/classes. Thus, a file in src/main/resources/etc
+ * will be copied by the resource plugin to ${project.build.directory}/classes/etc,
+ * and then added to the assembly by this goal.
+ * <br>
*/
-@Mojo(name = "assembly", defaultPhase = LifecyclePhase.PROCESS_RESOURCES, requiresDependencyResolution = ResolutionScope.RUNTIME)
+@Mojo(name = "assembly", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution = ResolutionScope.RUNTIME)
public class AssemblyMojo extends MojoSupport {
/**
http://git-wip-us.apache.org/repos/asf/karaf/blob/a8394fb6/tooling/pom.xml
----------------------------------------------------------------------