You are viewing a plain text version of this content. The canonical link for it is here.
Posted to soap-dev@xml.apache.org by du...@apache.org on 2001/04/07 03:46:49 UTC

cvs commit: xml-soap/java/src/org/apache/soap/providers EntityEJBProvider.java StatefulEJBProvider.java StatelessEJBProvider.java

dug         01/04/06 18:46:49

  Modified:    java/src/org/apache/soap/providers EntityEJBProvider.java
                        StatefulEJBProvider.java StatelessEJBProvider.java
  Log:
  Changed the EJB providers so that it grabs the JNDIName from
  one of the 'options' instead of from the 'java class='
  section of the deployment descriptor.  For backwards compatibility
  if it doesn't find it in the options section (using key="JNDIName")
  then it will look in the old 'java class=' section.
  
  Revision  Changes    Path
  1.3       +2 -1      xml-soap/java/src/org/apache/soap/providers/EntityEJBProvider.java
  
  Index: EntityEJBProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/providers/EntityEJBProvider.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EntityEJBProvider.java	2001/01/16 14:26:40	1.2
  +++ EntityEJBProvider.java	2001/04/07 01:46:49	1.3
  @@ -70,7 +70,8 @@
   
       // From the Deployment Descriptor get the JNDI lookup name that is inside
       // the "java" element...
  -    String jndiName = depDesc.getProviderClass();
  +    String jndiName = (String) props.get("JNDIName");
  +    if ( jndiName == null ) jndiName = depDesc.getProviderClass();
   
       if ((jndiName != null) && (getContxt() != null)) {
         try {
  
  
  
  1.5       +2 -1      xml-soap/java/src/org/apache/soap/providers/StatefulEJBProvider.java
  
  Index: StatefulEJBProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/providers/StatefulEJBProvider.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StatefulEJBProvider.java	2001/02/12 12:52:42	1.4
  +++ StatefulEJBProvider.java	2001/04/07 01:46:49	1.5
  @@ -253,7 +253,8 @@
   
       // From the Deployment Descriptor get the JNDI lookup name that is inside
       // the "java" element...
  -    String jndiName = dd.getProviderClass();
  +    String jndiName = (String) props.get("JNDIName");
  +    if ( jndiName == null ) jndiName = dd.getProviderClass();
   
       if ((jndiName != null) && (contxt != null)) {
         try {
  
  
  
  1.4       +2 -2      xml-soap/java/src/org/apache/soap/providers/StatelessEJBProvider.java
  
  Index: StatelessEJBProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/providers/StatelessEJBProvider.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StatelessEJBProvider.java	2001/01/16 14:26:40	1.3
  +++ StatelessEJBProvider.java	2001/04/07 01:46:49	1.4
  @@ -251,8 +251,8 @@
                   throw new SOAPException(Constants.FAULT_CODE_SERVER, "Error in Deployment Descriptor Property Settings");
   
           // From the Deployment Descriptor get the JNDI lookup name that is inside the "java" element...
  -        String jndiName = dd.getProviderClass();
  -
  +        String jndiName = (String) props.get("JNDIName");
  +        if ( jndiName == null ) jndiName = dd.getProviderClass();
   
           if ((jndiName != null) && (contxt != null)) {