[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment SessionBuilder.java

[djencks]

djencks     2005/08/21 03:36:31

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        SessionBuilder.java
  Log:

  GERONIMO-666.  Enable virtual host[] support for ejb web services
  
  Revision  Changes    Path
  1.34      +10 -5     
openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java
  
  Index: SessionBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- SessionBuilder.java       20 Aug 2005 22:50:49 -0000      1.33
  +++ SessionBuilder.java       21 Aug 2005 07:36:30 -0000      1.34
  @@ -106,7 +106,7 @@
   class SessionBuilder extends BeanBuilder {
   
       private final static String DEFAULT_AUTH_REALM_NAME = "Geronimo Web 
Service";
  -    
  +
       private final WebServiceBuilder webServiceBuilder;
       private final GBeanData linkDataTemplate;
   
  @@ -195,8 +195,6 @@
           J2eeContext j2eeContext = earContext.getJ2eeContext();
           OpenejbWebServiceSecurityType webServiceSecurity = 
openejbSessionBean == null ? null : openejbSessionBean.getWebServiceSecurity();
   
  -
  -
           //this code belongs here
           ObjectName linkName = null;
           try {
  @@ -217,12 +215,19 @@
               linkData.setAttribute("transportGuarantee", 
webServiceSecurity.getTransportGuarantee().toString());
               linkData.setAttribute("authMethod", 
webServiceSecurity.getAuthMethod().toString());
           }
  +
           linkData.setReferencePattern("WebServiceContainer", listener);
           linkData.setReferencePattern("EJBContainer", sessionObjectName);
   
  -        GBeanData gBean = linkData;
  +        if (openejbSessionBean != null) {
  +            String[] virtualHosts = 
openejbSessionBean.getWebServiceVirtualHostArray();
  +            for (int i = 0; i < virtualHosts.length; i++) {
  +                virtualHosts[i] = virtualHosts[i].trim();
  +            }
  +            linkData.setAttribute("virtualHosts", virtualHosts);
  +        }
   
  -        earContext.addGBean(gBean);
  +        earContext.addGBean(linkData);
       }
   
       private void addEJBContainerGBean(EARContext earContext, EJBModule 
ejbModule, ComponentPermissions componentPermissions, ClassLoader cl, 
ObjectName sessionObjectName, SessionBeanType sessionBean, 
OpenejbSessionBeanType openejbSessionBean, TransactionPolicyHelper 
transactionPolicyHelper, String policyContextID) throws DeploymentException {