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 2013/12/14 16:20:44 UTC
svn commit: r1550936 - in /karaf/trunk:
jndi/command/src/main/java/org/apache/karaf/jndi/command/
jndi/command/src/main/resources/OSGI-INF/
jndi/command/src/main/resources/OSGI-INF/blueprint/
jndi/core/src/main/java/org/apache/karaf/jndi/ jndi/core/src...
Author: jbonofre
Date: Sat Dec 14 15:20:44 2013
New Revision: 1550936
URL: http://svn.apache.org/r1550936
Log:
[KARAF-2511] Rename jndi list as jndi names
Added:
karaf/trunk/jndi/command/src/main/java/org/apache/karaf/jndi/command/NamesCommand.java
- copied, changed from r1550882, karaf/trunk/jndi/command/src/main/java/org/apache/karaf/jndi/command/ListCommand.java
Removed:
karaf/trunk/jndi/command/src/main/java/org/apache/karaf/jndi/command/ListCommand.java
Modified:
karaf/trunk/jndi/command/src/main/resources/OSGI-INF/blueprint/jndi-command.xml
karaf/trunk/jndi/command/src/main/resources/OSGI-INF/bundle.info
karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/JndiService.java
karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiMBeanImpl.java
karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
karaf/trunk/manual/src/main/webapp/users-guide/jndi.conf
Copied: karaf/trunk/jndi/command/src/main/java/org/apache/karaf/jndi/command/NamesCommand.java (from r1550882, karaf/trunk/jndi/command/src/main/java/org/apache/karaf/jndi/command/ListCommand.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/jndi/command/src/main/java/org/apache/karaf/jndi/command/NamesCommand.java?p2=karaf/trunk/jndi/command/src/main/java/org/apache/karaf/jndi/command/NamesCommand.java&p1=karaf/trunk/jndi/command/src/main/java/org/apache/karaf/jndi/command/ListCommand.java&r1=1550882&r2=1550936&rev=1550936&view=diff
==============================================================================
--- karaf/trunk/jndi/command/src/main/java/org/apache/karaf/jndi/command/ListCommand.java (original)
+++ karaf/trunk/jndi/command/src/main/java/org/apache/karaf/jndi/command/NamesCommand.java Sat Dec 14 15:20:44 2013
@@ -22,8 +22,8 @@ import org.apache.karaf.shell.table.Shel
import java.util.Map;
-@Command(scope = "jndi", name = "list", description = "List the JNDI names.")
-public class ListCommand extends JndiCommandSupport {
+@Command(scope = "jndi", name = "names", description = "List the JNDI names.")
+public class NamesCommand extends JndiCommandSupport {
@Argument(index = 0, name = "context", description = "The JNDI context to display the names", required = false, multiValued = false)
String context;
@@ -36,9 +36,9 @@ public class ListCommand extends JndiCom
Map<String, String> names;
if (context == null) {
- names = this.getJndiService().list();
+ names = this.getJndiService().names();
} else {
- names = this.getJndiService().list(context);
+ names = this.getJndiService().names(context);
}
for (String name : names.keySet()) {
Modified: karaf/trunk/jndi/command/src/main/resources/OSGI-INF/blueprint/jndi-command.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jndi/command/src/main/resources/OSGI-INF/blueprint/jndi-command.xml?rev=1550936&r1=1550935&r2=1550936&view=diff
==============================================================================
--- karaf/trunk/jndi/command/src/main/resources/OSGI-INF/blueprint/jndi-command.xml (original)
+++ karaf/trunk/jndi/command/src/main/resources/OSGI-INF/blueprint/jndi-command.xml Sat Dec 14 15:20:44 2013
@@ -26,7 +26,7 @@
</action>
</command>
<command>
- <action class="org.apache.karaf.jndi.command.ListCommand">
+ <action class="org.apache.karaf.jndi.command.NamesCommand">
<property name="jndiService" ref="jndiService" />
</action>
</command>
Modified: karaf/trunk/jndi/command/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/karaf/trunk/jndi/command/src/main/resources/OSGI-INF/bundle.info?rev=1550936&r1=1550935&r2=1550936&view=diff
==============================================================================
--- karaf/trunk/jndi/command/src/main/resources/OSGI-INF/bundle.info (original)
+++ karaf/trunk/jndi/command/src/main/resources/OSGI-INF/bundle.info Sat Dec 14 15:20:44 2013
@@ -17,7 +17,7 @@ The following commands are available:
* jndi:bind
* jndi:create
* jndi:delete
-* jndi:list
+* jndi:names
* jndi:unbind
h1. See also
Modified: karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/JndiService.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/JndiService.java?rev=1550936&r1=1550935&r2=1550936&view=diff
==============================================================================
--- karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/JndiService.java (original)
+++ karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/JndiService.java Sat Dec 14 15:20:44 2013
@@ -29,16 +29,16 @@ public interface JndiService {
* @return the JNDI names.
* @throws Exception
*/
- Map<String, String> list() throws Exception;
+ Map<String, String> names() throws Exception;
/**
- * List the current JNDI name in the given context.
+ * List the current JNDI names in the given context.
*
* @param context the JNDI context.
* @return the JNDI names in the context.
* @throws Exception
*/
- Map<String, String> list(String context) throws Exception;
+ Map<String, String> names(String context) throws Exception;
/**
* Create a sub-context.
Modified: karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiMBeanImpl.java?rev=1550936&r1=1550935&r2=1550936&view=diff
==============================================================================
--- karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiMBeanImpl.java (original)
+++ karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiMBeanImpl.java Sat Dec 14 15:20:44 2013
@@ -32,7 +32,7 @@ public class JndiMBeanImpl implements Jn
@Override
public Map<String, String> getNames() throws MBeanException {
try {
- return this.jndiService.list();
+ return this.jndiService.names();
} catch (Throwable t) {
throw new MBeanException(null, t.getMessage());
}
@@ -41,7 +41,7 @@ public class JndiMBeanImpl implements Jn
@Override
public Map<String, String> getNames(String context) throws MBeanException {
try {
- return this.jndiService.list(context);
+ return this.jndiService.names(context);
} catch (Throwable t) {
throw new MBeanException(null, t.getMessage());
}
Modified: karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java?rev=1550936&r1=1550935&r2=1550936&view=diff
==============================================================================
--- karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java (original)
+++ karaf/trunk/jndi/core/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java Sat Dec 14 15:20:44 2013
@@ -39,14 +39,14 @@ public class JndiServiceImpl implements
private final static String OSGI_JNDI_SERVICE_PROPERTY = "osgi.jndi.service.name";
@Override
- public Map<String, String> list() throws Exception {
- Map<String, String> result = list("/");
- result.putAll(list(OSGI_JNDI_CONTEXT_PREFIX + "/"));
+ public Map<String, String> names() throws Exception {
+ Map<String, String> result = names("/");
+ result.putAll(names(OSGI_JNDI_CONTEXT_PREFIX + "/"));
return result;
}
@Override
- public Map<String, String> list(String name) throws Exception {
+ public Map<String, String> names(String name) throws Exception {
Map<String, String> map = new HashMap<String, String>();
if (name.startsWith(OSGI_JNDI_CONTEXT_PREFIX)) {
// OSGi service binding
@@ -82,7 +82,7 @@ public class JndiServiceImpl implements
if (o instanceof Context) {
StringBuilder sb = new StringBuilder();
sb.append(pair.getName());
- list((Context) o, sb, map);
+ names((Context) o, sb, map);
} else {
map.put(pair.getName(), pair.getClassName());
}
@@ -99,7 +99,7 @@ public class JndiServiceImpl implements
* @param map the final map containing name/class name pairs.
* @throws Exception
*/
- private static final void list(Context ctx, StringBuilder sb, Map<String, String> map) throws Exception {
+ private static final void names(Context ctx, StringBuilder sb, Map<String, String> map) throws Exception {
NamingEnumeration list = ctx.listBindings("");
while (list.hasMore()) {
Binding item = (Binding) list.next();
@@ -108,7 +108,7 @@ public class JndiServiceImpl implements
Object o = item.getObject();
if (o instanceof Context) {
sb.append("/").append(name);
- list((Context) o, sb, map);
+ names((Context) o, sb, map);
} else {
map.put(sb.toString() + "/" + name, className);
}
Modified: karaf/trunk/manual/src/main/webapp/users-guide/jndi.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/jndi.conf?rev=1550936&r1=1550935&r2=1550936&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/jndi.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/jndi.conf Sat Dec 14 15:20:44 2013
@@ -55,13 +55,13 @@ h2. Commands
Apache Karaf provides specific commands to manipulate the JNDI service.
-h3. {{jndi:list}}
+h3. {{jndi:names}}
-The {{jndi:list}} command lists all JNDI names. It groups both the JNDI names from the {{osgi:service}} scheme and the
+The {{jndi:names}} command lists all JNDI names. It groups both the JNDI names from the {{osgi:service}} scheme and the
regular JNDI names:
{code}
-karaf@root()> jndi:list
+karaf@root()> jndi:names
JNDI Name | Class Name
------------------------------------------------------------------
osgi:service/jndi | org.apache.karaf.jndi.internal.JndiServiceImpl
@@ -71,19 +71,19 @@ jndi/service | org.apache.karaf.jnd
We can see here the {{osgi:service/jndi}} name (using the {{osgi:service}} scheme) and {{jndi/service}} name (using the
regular JNDI service).
-The {{jndi:list}} command accepts an optional {{context}} argument to list names on the given context.
+The {{jndi:names}} command accepts an optional {{context}} argument to list names on the given context.
For instance, you can list only names in the {{jndi}} sub-context:
{code}
-karaf@root()> jndi:list jndi
+karaf@root()> jndi:names jndi
JNDI Name | Class Name
----------------------------------------------------------
service | org.apache.karaf.jndi.internal.JndiServiceImpl
{code}
{warning}
-The {{jndi:list}} lists only names (the full qualified name). It means that the empty JNDI sub-contexts are not displayed.
+The {{jndi:names}} lists only names (the full qualified name). It means that the empty JNDI sub-contexts are not displayed.
{warning}
h3. {{jndi:create}}
@@ -110,7 +110,7 @@ The existing JNDI name can be a regular
{code}
karaf@root()> jndi:alias bean/services/jndi aliases/services/jndi
-karaf@root()> jndi:list
+karaf@root()> jndi:names
JNDI Name | Class Name
----------------------------------------------------------------------
osgi:service/jndi | org.apache.karaf.jndi.internal.JndiServiceImpl
@@ -122,7 +122,7 @@ or a name from the {{osgi:service}} sche
{code}
karaf@root()> jndi:alias osgi:service/jndi alias/jndi/service
-karaf@root()> jndi:list
+karaf@root()> jndi:names
JNDI Name | Class Name
-------------------------------------------------------------------
osgi:service/jndi | org.apache.karaf.jndi.internal.JndiServiceImpl
@@ -141,7 +141,7 @@ For instance, we can bind the OSGi servi
{code}
karaf@root()> jndi:bind 344 services/kar
-karaf@root()> jndi:list
+karaf@root()> jndi:names
JNDI Name | Class Name
-------------------------------------------------------------------------------
osgi:service/jndi | org.apache.karaf.jndi.internal.JndiServiceImpl
@@ -153,13 +153,13 @@ h3. {{jndi:unbind}}
The {{jndi:unbind}} command unbind a given JNDI name:
{code}
-karaf@root()> jndi:list
+karaf@root()> jndi:names
JNDI Name | Class Name
-------------------------------------------------------------------------------
osgi:service/jndi | org.apache.karaf.jndi.internal.JndiServiceImpl
services/kar | org.apache.karaf.kar.internal.KarServiceImpl
karaf@root()> jndi:unbind services/kar
-karaf@root()> jndi:list
+karaf@root()> jndi:names
JNDI Name | Class Name
-------------------------------------------------------------------------------
osgi:service/jndi | org.apache.karaf.jndi.internal.JndiServiceImpl