geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r464994 - in /geronimo/xbean/trunk/xbean-naming: pom.xml src/main/java/org/apache/xbean/naming/context/ContextUtil.java
Date Tue, 17 Oct 2006 18:42:01 GMT
Author: dain
Date: Tue Oct 17 11:42:00 2006
New Revision: 464994

URL: http://svn.apache.org/viewvc?view=rev&rev=464994
Log:
remove dependency on geronimo-naming

Modified:
    geronimo/xbean/trunk/xbean-naming/pom.xml
    geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/ContextUtil.java

Modified: geronimo/xbean/trunk/xbean-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-naming/pom.xml?view=diff&rev=464994&r1=464993&r2=464994
==============================================================================
--- geronimo/xbean/trunk/xbean-naming/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-naming/pom.xml Tue Oct 17 11:42:00 2006
@@ -29,11 +29,5 @@
       <groupId>backport-util-concurrent</groupId>
       <artifactId>backport-util-concurrent</artifactId>
     </dependency>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>geronimo-naming</artifactId>
-      <version>1.1</version>
-      <optional>true</optional>
-    </dependency>
   </dependencies>
 </project>

Modified: geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/ContextUtil.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/ContextUtil.java?view=diff&rev=464994&r1=464993&r2=464994
==============================================================================
--- geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/ContextUtil.java
(original)
+++ geronimo/xbean/trunk/xbean-naming/src/main/java/org/apache/xbean/naming/context/ContextUtil.java
Tue Oct 17 11:42:00 2006
@@ -66,16 +66,6 @@
             }
         }
 
-        if (reference instanceof org.apache.geronimo.naming.reference.SimpleReference) {
-            try {
-                return ((org.apache.geronimo.naming.reference.SimpleReference) reference).getContent();
-            } catch (NamingException e) {
-                throw e;
-            } catch (Exception e) {
-                throw (NamingException) new NamingException("Could not look up : " + name).initCause(e);
-            }
-        }
-
         // for normal References we have to do it the slow way
         try {
             return NamingManager.getObjectInstance(reference, null, null, new Hashtable());



Mime
View raw message