aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hugh...@apache.org
Subject svn commit: r1209419 - in /aries/branches/dec-2011-jndi-release/jndi: ./ jndi-core/src/main/java/org/apache/aries/jndi/ jndi-core/src/test/java/org/apache/aries/jndi/ jndi-url/src/main/java/org/apache/aries/jndi/ jndi-url/src/main/java/org/apache/aries...
Date Fri, 02 Dec 2011 11:37:02 GMT
Author: hughesj
Date: Fri Dec  2 11:37:01 2011
New Revision: 1209419

URL: http://svn.apache.org/viewvc?rev=1209419&view=rev
Log:
Merging in from trunk

Modified:
    aries/branches/dec-2011-jndi-release/jndi/   (props changed)
    aries/branches/dec-2011-jndi-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/
  (props changed)
    aries/branches/dec-2011-jndi-release/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java
  (props changed)
    aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/
  (props changed)
    aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java
    aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/test/java/org/apache/aries/jndi/
  (props changed)

Propchange: aries/branches/dec-2011-jndi-release/jndi/
------------------------------------------------------------------------------
    svn:mergeinfo = /aries/trunk/jndi:1209408-1209417

Propchange: aries/branches/dec-2011-jndi-release/jndi/jndi-core/src/main/java/org/apache/aries/jndi/
            ('svn:mergeinfo' removed)

Propchange: aries/branches/dec-2011-jndi-release/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java
            ('svn:mergeinfo' removed)

Propchange: aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/
            ('svn:mergeinfo' removed)

Modified: aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java
URL: http://svn.apache.org/viewvc/aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java?rev=1209419&r1=1209418&r2=1209419&view=diff
==============================================================================
--- aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java
(original)
+++ aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java
Fri Dec  2 11:37:01 2011
@@ -32,6 +32,7 @@ import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 
 import org.apache.aries.jndi.services.ServiceHelper;
+import org.apache.aries.util.nls.MessageUtil;
 import org.osgi.framework.AdminPermission;
 import org.osgi.framework.BundleContext;
 
@@ -74,6 +75,8 @@ public class ServiceRegistryContext exte
         return listBindings(parse(name));
     }
 
+    private static final MessageUtil MESSAGES = MessageUtil.createMessageUtil(ServiceRegistryContext.class,
"org.apache.aries.jndi.nls.jndiUrlMessages");
+
     public Object lookup(Name name) throws NamingException {
         Object result;
 
@@ -90,7 +93,7 @@ public class ServiceRegistryContext exte
                     AccessController.checkPermission(adminPermission);
                     return callerContext;
                 } catch (AccessControlException accessControlException) {
-                    NamingException namingException = new NameNotFoundException(ServiceHelper.MESSAGES.getMessage("caller.not.priviledged"));
+                    NamingException namingException = new NameNotFoundException(MESSAGES.getMessage("caller.not.priviledged"));
                     namingException.setRootCause(accessControlException);
                     throw namingException;
                 }

Propchange: aries/branches/dec-2011-jndi-release/jndi/jndi-url/src/test/java/org/apache/aries/jndi/
            ('svn:mergeinfo' removed)



Mime
View raw message