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 2018/07/30 17:18:49 UTC
[karaf] branch master updated (2a4ecfa -> 0edcbb9)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.
from 2a4ecfa Merge pull request #580 from jbonofre/KARAF-5850
add ea7cdbe [KARAF-4996] Fix instance resources to expose same packages as the root instance
new 0edcbb9 Merge pull request #582 from jbonofre/KARAF-4996
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
instance/pom.xml | 28 +++++++++
.../core/internal/InstanceServiceImpl.java | 48 +++++++++-----
.../instance}/resources/etc/config.properties | 36 ++++++-----
.../karaf/instance/resources/etc/jmx.acl.cfg | 73 ++++++++++++++++++++++
.../resources/etc/jmx.acl.java.lang.Memory.cfg | 9 ++-
.../etc/jmx.acl.org.apache.karaf.bundle.cfg | 28 ++++++---
.../etc/jmx.acl.org.apache.karaf.config.cfg | 52 +++++++++++++++
.../etc/jmx.acl.org.apache.karaf.security.jmx.cfg | 13 ++--
.../resources/etc/jmx.acl.osgi.compendium.cm.cfg | 53 ++++++++++++++++
...org.apache.felix.eventadmin.impl.EventAdmin.cfg | 5 +-
.../etc/org.apache.felix.fileinstall-deploy.cfg | 0
.../etc/org.apache.karaf.command.acl.bundle.cfg | 34 +++++++---
.../etc/org.apache.karaf.command.acl.config.cfg | 44 +++++++++++++
.../etc/org.apache.karaf.command.acl.feature.cfg | 15 ++---
.../etc/org.apache.karaf.command.acl.jaas.cfg | 11 ++--
.../etc/org.apache.karaf.command.acl.kar.cfg | 13 ++--
.../org.apache.karaf.command.acl.scope_bundle.cfg | 21 ++++---
.../etc/org.apache.karaf.command.acl.shell.cfg | 10 ++-
.../etc/org.apache.karaf.command.acl.system.cfg | 15 ++---
.../etc/org.apache.karaf.features.repos.cfg | 55 ++++++++++++++++
.../resources/etc/org.apache.karaf.jaas.cfg | 42 ++++++++++---
.../resources/etc/org.apache.karaf.kar.cfg | 2 +-
.../resources/etc/org.apache.karaf.log.cfg | 17 ++---
23 files changed, 500 insertions(+), 124 deletions(-)
copy {assemblies/features/base/src/main/filtered-resources => instance/src/main/resources/org/apache/karaf/instance}/resources/etc/config.properties (92%)
create mode 100644 instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.cfg
copy archetypes/feature/src/test/resources/projects/feature/archetype.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.java.lang.Memory.cfg (88%)
copy assemblies/features/base/src/main/filtered-resources/resources/etc/custom.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.bundle.cfg (59%)
create mode 100644 instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.config.cfg
copy assemblies/features/base/src/main/filtered-resources/resources/etc/custom.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.org.apache.karaf.security.jmx.cfg (78%)
create mode 100644 instance/src/main/resources/org/apache/karaf/instance/resources/etc/jmx.acl.osgi.compendium.cm.cfg
copy archetypes/feature/src/test/resources/projects/feature/archetype.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.felix.eventadmin.impl.EventAdmin.cfg (91%)
copy {assemblies/features/framework/src/main/resources => instance/src/main/resources/org/apache/karaf/instance}/resources/etc/org.apache.felix.fileinstall-deploy.cfg (100%)
copy assemblies/features/base/src/main/filtered-resources/resources/etc/custom.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.bundle.cfg (57%)
create mode 100644 instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.config.cfg
copy archetypes/command/src/test/resources/projects/command/archetype.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.feature.cfg (86%)
copy archetypes/command/src/test/resources/projects/command/archetype.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.jaas.cfg (86%)
copy assemblies/features/base/src/main/filtered-resources/resources/etc/custom.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.kar.cfg (82%)
copy assemblies/features/base/src/main/filtered-resources/resources/etc/custom.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.scope_bundle.cfg (71%)
copy archetypes/feature/src/test/resources/projects/feature/archetype.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.shell.cfg (88%)
copy assemblies/features/base/src/main/filtered-resources/resources/etc/custom.properties => instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.system.cfg (71%)
create mode 100644 instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.features.repos.cfg
copy assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.kar.cfg => instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.jaas.cfg (59%)
copy {assemblies/features/framework/src/main/resources => instance/src/main/resources/org/apache/karaf/instance}/resources/etc/org.apache.karaf.kar.cfg (97%)
copy assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.kar.cfg => instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.log.cfg (59%)
[karaf] 01/01: Merge pull request #582 from jbonofre/KARAF-4996
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 0edcbb92afa95160e049ca22e8a26adb004c39ad
Merge: 2a4ecfa ea7cdbe
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Jul 30 19:18:35 2018 +0200
Merge pull request #582 from jbonofre/KARAF-4996
[KARAF-4996] Fix instance resources to expose same packages as the root instance
instance/pom.xml | 28 +++
.../core/internal/InstanceServiceImpl.java | 48 ++--
.../karaf/instance/resources/etc/config.properties | 264 +++++++++++++++++++++
.../karaf/instance/resources/etc/jmx.acl.cfg | 73 ++++++
.../resources/etc/jmx.acl.java.lang.Memory.cfg | 25 ++
.../etc/jmx.acl.org.apache.karaf.bundle.cfg | 38 +++
.../etc/jmx.acl.org.apache.karaf.config.cfg | 52 ++++
.../etc/jmx.acl.org.apache.karaf.security.jmx.cfg | 27 +++
.../resources/etc/jmx.acl.osgi.compendium.cm.cfg | 53 +++++
...org.apache.felix.eventadmin.impl.EventAdmin.cfg | 21 ++
.../etc/org.apache.felix.fileinstall-deploy.cfg | 25 ++
.../etc/org.apache.karaf.command.acl.bundle.cfg | 44 ++++
.../etc/org.apache.karaf.command.acl.config.cfg | 44 ++++
.../etc/org.apache.karaf.command.acl.feature.cfg | 27 +++
.../etc/org.apache.karaf.command.acl.jaas.cfg | 23 ++
.../etc/org.apache.karaf.command.acl.kar.cfg | 27 +++
.../org.apache.karaf.command.acl.scope_bundle.cfg | 31 +++
.../etc/org.apache.karaf.command.acl.shell.cfg | 26 ++
.../etc/org.apache.karaf.command.acl.system.cfg | 27 +++
.../etc/org.apache.karaf.features.repos.cfg | 55 +++++
.../resources/etc/org.apache.karaf.jaas.cfg | 61 +++++
.../resources/etc/org.apache.karaf.kar.cfg | 35 +++
.../resources/etc/org.apache.karaf.log.cfg | 36 +++
23 files changed, 1076 insertions(+), 14 deletions(-)