karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-3072] Align child instances cfg file with the root instance
Date Wed, 10 Sep 2014 13:31:03 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x 23dfa2b5c -> ff9b0f81c


[KARAF-3072] Align child instances cfg file with the root instance


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ff9b0f81
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ff9b0f81
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ff9b0f81

Branch: refs/heads/karaf-2.x
Commit: ff9b0f81c2a5c44bc99979faa10dbbc8952d7691
Parents: 23dfa2b
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Sep 10 15:30:35 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Sep 10 15:30:35 2014 +0200

----------------------------------------------------------------------
 admin/core/pom.xml                                       |  4 +++-
 .../org/apache/karaf/admin/etc/system.properties         | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ff9b0f81/admin/core/pom.xml
----------------------------------------------------------------------
diff --git a/admin/core/pom.xml b/admin/core/pom.xml
index f29f323..2ab5c46 100644
--- a/admin/core/pom.xml
+++ b/admin/core/pom.xml
@@ -120,6 +120,7 @@
                             <resources>
                                 <resource>
                                     <directory>../../assemblies/apache-karaf/src/main/distribution/text/etc/</directory>
+                                    <filtering>false</filtering>
                                     <includes>
                                         <include>*.policy</include>
                                         <include>*.properties</include>
@@ -129,6 +130,7 @@
                                     <excludes>
                                         <exclude>org.apache.karaf.shell.cfg</exclude>
                                         <exclude>org.apache.karaf.management.cfg</exclude>
+                                        <exclude>org.ops4j.pax.url.mvn.cfg</exclude>
                                         <exclude>system.properties</exclude>
                                     </excludes>
                                 </resource>
@@ -168,7 +170,7 @@
                             <resources>
                                 <resource>
                                     <directory>../../assemblies/apache-karaf/src/main/distribution/release/etc/</directory>
-                                    <filtering>true</filtering>
+                                    <filtering>false</filtering>
                                     <includes>
                                         <include>*.cfg</include>
                                     </includes>

http://git-wip-us.apache.org/repos/asf/karaf/blob/ff9b0f81/admin/core/src/main/resources/org/apache/karaf/admin/etc/system.properties
----------------------------------------------------------------------
diff --git a/admin/core/src/main/resources/org/apache/karaf/admin/etc/system.properties b/admin/core/src/main/resources/org/apache/karaf/admin/etc/system.properties
index 971bfa8..4a7bead 100644
--- a/admin/core/src/main/resources/org/apache/karaf/admin/etc/system.properties
+++ b/admin/core/src/main/resources/org/apache/karaf/admin/etc/system.properties
@@ -70,6 +70,17 @@ karaf.shell.init.script = ${karaf.etc}/shell.init.script
 karaf.admin.role = admin
 
 #
+# Roles to use when logging into a local Karaf console.
+# The syntax is the following:
+#   [classname:]principal
+# where classname is the class name of the principal object
+# (defaults to org.apache.karaf.jaas.modules.RolePrincipal)
+# and principal is the name of the principal of that class
+# (defaults to admin).
+#
+karaf.local.roles = admin,manager,viewer
+
+#
 # Set this empty property to avoid errors when validating xml documents.
 #
 xml.catalog.files =


Mime
View raw message