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/06/01 20:58:29 UTC
[1/2] karaf git commit: [KARAF-3747] Handle local context aliasing
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x c707e27d4 -> 3b30c906e
[KARAF-3747] Handle local context aliasing
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/efa350aa
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/efa350aa
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/efa350aa
Branch: refs/heads/karaf-3.0.x
Commit: efa350aaad7ef2831d32fd11886d1229009843e7
Parents: 64fbc50
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Jun 1 20:56:14 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Jun 1 20:56:14 2015 +0200
----------------------------------------------------------------------
.../apache/karaf/jndi/internal/JndiServiceImpl.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/efa350aa/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
----------------------------------------------------------------------
diff --git a/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java b/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
index 68d6b94..0508462 100644
--- a/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
+++ b/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
@@ -37,7 +37,7 @@ public class JndiServiceImpl implements JndiService {
private BundleContext bundleContext;
private ProxyManager proxyManager;
- private final static String OSGI_JNDI_CONTEXT_PREFIX = "osgi:service/";
+ private final static String OSGI_JNDI_CONTEXT_PREFIX = "osgi:service";
private final static String OSGI_JNDI_SERVICE_PROPERTY = "osgi.jndi.service.name";
@Override
@@ -63,7 +63,9 @@ public class JndiServiceImpl implements JndiService {
if (proxyManager.isProxy(actualService)) {
actualService = proxyManager.unwrap(actualService).call();
}
- map.put(OSGI_JNDI_CONTEXT_PREFIX + service.getProperty(OSGI_JNDI_SERVICE_PROPERTY), actualService.getClass().getName());
+ if (service.getProperty(OSGI_JNDI_SERVICE_PROPERTY).toString().startsWith("/"))
+ map.put(OSGI_JNDI_CONTEXT_PREFIX + service.getProperty(OSGI_JNDI_SERVICE_PROPERTY), actualService.getClass().getName());
+ else map.put(OSGI_JNDI_CONTEXT_PREFIX + "/" + service.getProperty(OSGI_JNDI_SERVICE_PROPERTY), actualService.getClass().getName());
bundleContext.ungetService(service);
}
}
@@ -83,10 +85,14 @@ public class JndiServiceImpl implements JndiService {
}
if (o instanceof Context) {
StringBuilder sb = new StringBuilder();
- sb.append("/" + pair.getName());
+ if (pair.getName().contains(":"))
+ sb.append(pair.getName());
+ else sb.append("/" + pair.getName());
names((Context) o, sb, map);
} else {
- map.put("/" + pair.getName(), pair.getClassName());
+ if (pair.getName().contains(":"))
+ map.put(pair.getName(), pair.getClassName());
+ else map.put("/" + pair.getName(), pair.getClassName());
}
}
}
@@ -235,7 +241,7 @@ public class JndiServiceImpl implements JndiService {
ServiceReference<?>[] services = bundle.getRegisteredServices();
if (services != null) {
for (ServiceReference service : services) {
- if (service.getProperty(OSGI_JNDI_SERVICE_PROPERTY) != null && ((String) service.getProperty(OSGI_JNDI_SERVICE_PROPERTY)).equals(name.substring(OSGI_JNDI_CONTEXT_PREFIX.length()))) {
+ if (service.getProperty(OSGI_JNDI_SERVICE_PROPERTY) != null && ((String) service.getProperty(OSGI_JNDI_SERVICE_PROPERTY)).equals(name.substring(OSGI_JNDI_CONTEXT_PREFIX.length() + 1))) {
Object actualService = bundleContext.getService(service);
try {
if (proxyManager.isProxy(actualService)) {
[2/2] karaf git commit: Merge branch 'karaf-3.0.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Posted by jb...@apache.org.
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3b30c906
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3b30c906
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3b30c906
Branch: refs/heads/karaf-3.0.x
Commit: 3b30c906e228a3bdecfb2281c44498ad7648add3
Parents: efa350a c707e27
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Jun 1 20:58:16 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Jun 1 20:58:16 2015 +0200
----------------------------------------------------------------------
.../apache/karaf/log/command/DisplayLog.java | 31 ++++++++++++++++++--
.../org/apache/karaf/log/command/LogTail.java | 23 +++++++++++++--
2 files changed, 49 insertions(+), 5 deletions(-)
----------------------------------------------------------------------