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:47 UTC
[04/10] karaf git commit: KARAF-3982: a test.
KARAF-3982: a test.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d1f00dcb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d1f00dcb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d1f00dcb
Branch: refs/heads/master
Commit: d1f00dcb52eecc168da77e3bb4419571dc03bc11
Parents: 2b17090
Author: Benson Margulies <be...@basistech.com>
Authored: Wed Sep 9 10:58:35 2015 -0400
Committer: Benson Margulies <be...@basistech.com>
Committed: Wed Sep 9 10:58:35 2015 -0400
----------------------------------------------------------------------
.../src/main/karaf/assembly-property-edits.xml | 35 ++++++++++++++++++++
.../org/apache/karaf/tools/utils/test-edits.xml | 17 ++++++++++
2 files changed, 52 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/d1f00dcb/tooling/karaf-maven-plugin/src/it/test-assembly-prop-edits/src/main/karaf/assembly-property-edits.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-assembly-prop-edits/src/main/karaf/assembly-property-edits.xml b/tooling/karaf-maven-plugin/src/it/test-assembly-prop-edits/src/main/karaf/assembly-property-edits.xml
new file mode 100644
index 0000000..eb3cd27
--- /dev/null
+++ b/tooling/karaf-maven-plugin/src/it/test-assembly-prop-edits/src/main/karaf/assembly-property-edits.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<property-edits xmlns="http://karaf.apache.org/tools/property-edits/1.0.0">
+ <edits>
+ <edit>
+ <file>config.properties</file>
+ <operation>put</operation>
+ <key>karaf.framework</key>
+ <value>equinox</value>
+ </edit>
+ <edit>
+ <file>config.properties</file>
+ <operation>extend</operation>
+ <key>org.osgi.framework.system.capabilities</key>
+ <value>my-magic-capability</value>
+ </edit>
+ </edits>
+</property-edits>
http://git-wip-us.apache.org/repos/asf/karaf/blob/d1f00dcb/tooling/utils/src/test/resources/org/apache/karaf/tools/utils/test-edits.xml
----------------------------------------------------------------------
diff --git a/tooling/utils/src/test/resources/org/apache/karaf/tools/utils/test-edits.xml b/tooling/utils/src/test/resources/org/apache/karaf/tools/utils/test-edits.xml
index 2aa8fca..59b792b 100644
--- a/tooling/utils/src/test/resources/org/apache/karaf/tools/utils/test-edits.xml
+++ b/tooling/utils/src/test/resources/org/apache/karaf/tools/utils/test-edits.xml
@@ -1,4 +1,21 @@
<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<property-edits xmlns="http://karaf.apache.org/tools/property-edits/1.0.0">
<edits>
<edit>