User: starksm
Date: 01/05/24 00:04:00
Modified: src/main/org/jboss/ejb Tag: Branch_2_2 Container.java
Log:
Use the immeadiate jndi-name or res-url if no resource-name was given
Revision Changes Path
No revision
No revision
1.37.2.1 +7 -7 jboss/src/main/org/jboss/ejb/Container.java
Index: Container.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/Container.java,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -r1.37 -r1.37.2.1
--- Container.java 2001/02/27 16:48:07 1.37
+++ Container.java 2001/05/24 07:04:00 1.37.2.1
@@ -67,7 +67,7 @@
* @see ContainerFactory
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
- * @version $Revision: 1.37 $
+ * @version $Revision: 1.37.2.1 $
*/
public abstract class Container
{
@@ -467,6 +467,10 @@
String resourceName = ref.getResourceName();
String finalName = application.getResourceByName(resourceName);
+ /* If there was no resource-manager specified then an immeadiate
+ jndi-name or res-url name should have been given */
+ if (finalName == null)
+ finalName = ref.getJndiName();
if (finalName == null)
{
@@ -497,16 +501,12 @@
}
}
- if (ref.getType().equals("javax.sql.DataSource"))
- {
- // Datasource bindings
- bind(ctx, ref.getRefName(), new LinkRef(finalName));
- }
- else if (ref.getType().equals("java.net.URL"))
+ if (ref.getType().equals("java.net.URL"))
{
// URL bindings
try
{
+ Logger.debug("Binding URL "+finalName+ " to JDNI ENC "
+ref.getRefName());
bind(ctx, ref.getRefName(), new URL(finalName));
} catch (MalformedURLException e)
{
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
