You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2014/05/27 10:06:31 UTC

[2/2] git commit: move cfg file to correct folder (cherry picked from commit 889bf96ed636e0f529a8b31ec1d233affe3121ab)

move cfg file to correct folder
(cherry picked from commit 889bf96ed636e0f529a8b31ec1d233affe3121ab)


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

Branch: refs/heads/master
Commit: 3b336bb29c5f3c162b7c318e39c0e67f75e4b35b
Parents: f5c4262
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue May 27 16:01:17 2014 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue May 27 16:06:12 2014 +0800

----------------------------------------------------------------------
 .../text/etc/org.apache.karaf.command.acl.scope_bundle.cfg  | 9 ---------
 .../etc/org.apache.karaf.command.acl.scope_bundle.cfg       | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/3b336bb2/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.command.acl.scope_bundle.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.command.acl.scope_bundle.cfg b/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.command.acl.scope_bundle.cfg
deleted file mode 100644
index 62c8d57..0000000
--- a/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.command.acl.scope_bundle.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-features=org.apache.karaf.features.command
-jaas=org.apache.karaf.jaas.command
-admin=org.apache.karaf.admin.command
-osgi=org.apache.karaf.shell.osgi
-log=org.apache.karaf.shell.log
-packages=org.apache.karaf.shell.packages
-config=org.apache.karaf.shell.config
-ssh=org.apache.karaf.shell.ssh
-shell=org.apache.karaf.shell.commands

http://git-wip-us.apache.org/repos/asf/karaf/blob/3b336bb2/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.command.acl.scope_bundle.cfg
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.command.acl.scope_bundle.cfg b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.command.acl.scope_bundle.cfg
new file mode 100644
index 0000000..62c8d57
--- /dev/null
+++ b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.command.acl.scope_bundle.cfg
@@ -0,0 +1,9 @@
+features=org.apache.karaf.features.command
+jaas=org.apache.karaf.jaas.command
+admin=org.apache.karaf.admin.command
+osgi=org.apache.karaf.shell.osgi
+log=org.apache.karaf.shell.log
+packages=org.apache.karaf.shell.packages
+config=org.apache.karaf.shell.config
+ssh=org.apache.karaf.shell.ssh
+shell=org.apache.karaf.shell.commands