[jboss-cvs] JBossAS SVN: r80575 - in trunk: server/src/main/org/jboss/naming and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2008-11-05 22:27:30 -0500 (Wed, 05 Nov 2008)
New Revision: 80575

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/main/org/jboss/naming/NamingService.java
Log:
JBAS-6025, upgrade to naming 5.0.0.GA


Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-11-06 01:45:17 UTC (rev 80574)
+++ trunk/component-matrix/pom.xml	2008-11-06 03:27:30 UTC (rev 80575)
@@ -69,7 +69,7 @@
     <version.org.jboss.integration>5.0.0.GA</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
     <version.org.jboss.metadata>1.0.0.CR5</version.org.jboss.metadata>
-    <version.org.jboss.naming>5.0.0.CR3</version.org.jboss.naming>
+    <version.org.jboss.naming>5.0.0.GA</version.org.jboss.naming>
     <version.org.jboss.remoting>2.5.0.SP1</version.org.jboss.remoting>
     <version.org.jboss.security>2.0.2.CR12</version.org.jboss.security>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>

Modified: trunk/server/src/main/org/jboss/naming/NamingService.java
===================================================================
--- trunk/server/src/main/org/jboss/naming/NamingService.java	2008-11-06 01:45:17 UTC (rev 80574)
+++ trunk/server/src/main/org/jboss/naming/NamingService.java	2008-11-06 03:27:30 UTC (rev 80575)
@@ -21,6 +21,7 @@
  */
 package org.jboss.naming;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
@@ -76,14 +77,38 @@
 
    public NamingBean getNaming()
    {
-      return namingBean;
+      return getNamingInfo();
    }
    public void setNaming(NamingBean bean)
    {
+      setNamingInfo(bean);
+   }
+   public NamingBean getNamingInfo()
+   {
+      return namingBean;
+   }
+   public void setNamingInfo(NamingBean bean)
+   {
       this.namingBean = bean;
       this.namingMain.setNamingInfo(bean);
    }
 
+   public Object getNamingProxy()
+      throws Exception
+   {
+      Object proxy = null;
+      if(proxyFactory != null)
+         proxy = proxyFactory.getProxy();
+      else
+         proxy = namingMain.getNamingProxy();
+      return proxy;
+   }
+   public void setNamingProxy(Object proxy)
+      throws IOException
+   {
+      namingMain.setNamingProxy(proxy);
+   }
+
    public Naming getNamingInstance()
    {
       return namingBean.getNamingInstance();
@@ -378,3 +403,4 @@
       return value;
    }
 }
+