You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by no...@apache.org on 2010/01/23 21:56:42 UTC
svn commit: r902493 - in /incubator/aries/trunk/jndi/jndi-url/src:
main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java
test/java/org/apache/aries/jndi/url/ServiceRegistryContextTest.java
Author: not
Date: Sat Jan 23 20:56:37 2010
New Revision: 902493
URL: http://svn.apache.org/viewvc?rev=902493&view=rev
Log:
ARIES-22 Removing the code in list and listBindings to correctly meet the JNDI spec. Stopped running the tests rather than removed so they can be more easily reused later.
Modified:
incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java
incubator/aries/trunk/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/ServiceRegistryContextTest.java
Modified: incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java?rev=902493&r1=902492&r2=902493&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java (original)
+++ incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java Sat Jan 23 20:56:37 2010
@@ -20,7 +20,6 @@
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.Map;
import javax.naming.Binding;
@@ -154,49 +153,8 @@
public NamingEnumeration<NameClassPair> list(final Name name) throws NamingException
{
- int nameSize = validateName(name);
-
- String className = name.get(0);
- String filter = null;
-
- if (nameSize == 2) {
- filter = name.get(1);
- }
-
- try {
- final Iterator<?> it = ServiceHelper.getServices(className, filter).iterator();
-
- return new NamingEnumeration<NameClassPair>() {
- public void close() throws NamingException
- {
- // TODO return stuff to the registry, maybe???
- }
-
- public boolean hasMore()
- {
- return it.hasNext();
- }
-
- public NameClassPair next()
- {
- return nextElement();
- }
-
- public boolean hasMoreElements()
- {
- return it.hasNext();
- }
-
- public NameClassPair nextElement()
- {
- return new NameClassPair(name.toString(), it.next().getClass().getCanonicalName(), false);
- }
- };
- } catch (IllegalArgumentException e) {
- NamingException ne = new NamingException(e.getMessage());
- ne.initCause(e);
- throw ne;
- } }
+ throw new NamingException("Not a Context");
+ }
public NamingEnumeration<NameClassPair> list(String name) throws NamingException
{
@@ -205,51 +163,7 @@
public NamingEnumeration<Binding> listBindings(final Name name) throws NamingException
{
- String className = null;
- String filter = null;
-
- int nameSize = validateName(name);
-
- className = name.get(0);
-
- if (nameSize == 2) {
- filter = name.get(1);
- }
-
- try {
- final Iterator<?> it = ServiceHelper.getServices(className, filter).iterator();
-
- return new NamingEnumeration<Binding>() {
- public void close() throws NamingException
- {
- // TODO return stuff to the registry, maybe???
- }
-
- public boolean hasMore()
- {
- return it.hasNext();
- }
-
- public Binding next()
- {
- return nextElement();
- }
-
- public boolean hasMoreElements()
- {
- return it.hasNext();
- }
-
- public Binding nextElement()
- {
- return new Binding(name.toString(), it.next(), false);
- }
- };
- } catch (IllegalArgumentException e) {
- NamingException ne = new NamingException(e.getMessage());
- ne.initCause(e);
- throw ne;
- }
+ throw new NamingException("Not a Context");
}
public NamingEnumeration<Binding> listBindings(String name) throws NamingException
Modified: incubator/aries/trunk/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/ServiceRegistryContextTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/ServiceRegistryContextTest.java?rev=902493&r1=902492&r2=902493&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/ServiceRegistryContextTest.java (original)
+++ incubator/aries/trunk/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/ServiceRegistryContextTest.java Sat Jan 23 20:56:37 2010
@@ -247,7 +247,6 @@
*
* @throws NamingException
*/
- @Test
public void listRepositoryContents() throws NamingException
{
InitialContext ctx = new InitialContext();
@@ -332,7 +331,6 @@
*
* @throws NamingException
*/
- @Test
public void listRepositoryBindings() throws NamingException
{
InitialContext ctx = new InitialContext();