[jboss-cvs] JBossAS SVN: r111662 - projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common.

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

Author: jesper.pedersen
Date: 2011-06-23 12:17:38 -0400 (Thu, 23 Jun 2011)
New Revision: 111662

Modified:
   projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
   projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
Log:
Don't require / in java: bindings

Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java	2011-06-23 15:36:22 UTC (rev 111661)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java	2011-06-23 16:17:38 UTC (rev 111662)
@@ -345,13 +345,13 @@
    {
       if (javaContext != null)
       {
-         if (javaContext.booleanValue() && !jndiName.startsWith("java:/"))
+         if (javaContext.booleanValue() && !jndiName.startsWith("java:"))
          {
-            jndiName = "java:/" + jndiName;
+            jndiName = "java:" + jndiName;
          }
-         else if (!javaContext.booleanValue() && jndiName.startsWith("java:/"))
+         else if (!javaContext.booleanValue() && jndiName.startsWith("java:"))
          {
-            jndiName = jndiName.substring(7);
+            jndiName = jndiName.substring(6);
          }
       }
 

Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-06-23 15:36:22 UTC (rev 111661)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-06-23 16:17:38 UTC (rev 111662)
@@ -1790,13 +1790,13 @@
    {
       if (javaContext != null)
       {
-         if (javaContext.booleanValue() && !jndiName.startsWith("java:/"))
+         if (javaContext.booleanValue() && !jndiName.startsWith("java:"))
          {
-            jndiName = "java:/" + jndiName;
+            jndiName = "java:" + jndiName;
          }
-         else if (!javaContext.booleanValue() && jndiName.startsWith("java:/"))
+         else if (!javaContext.booleanValue() && jndiName.startsWith("java:"))
          {
-            jndiName = jndiName.substring(7);
+            jndiName = jndiName.substring(6);
          }
       }