djencks     2005/04/16 15:01:54

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

  more secret workarounds
  
  Revision  Changes    Path
  1.16      +1 -1      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java
  
  Index: EntityBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- EntityBuilder.java        15 Apr 2005 05:36:53 -0000      1.15
  +++ EntityBuilder.java        16 Apr 2005 19:01:54 -0000      1.16
  @@ -249,7 +249,7 @@
   
               //TODO go back to the commented version when possible
   //        String contextID = builder.getContainerId();
  -            String contextID = builder.getContainerId().replaceAll("[, ]", 
"_");
  +            String contextID = builder.getContainerId().replaceAll("[,: ]", 
"_");
               earContext.addSecurityContext(contextID, componentPermissions);
   
               
containerSecurityBuilder.setDetails(entityBean.getSecurityIdentity(), 
securityConfiguration, builder);
  
  
  
  1.18      +1 -1      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java
  
  Index: MdbBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- MdbBuilder.java   15 Apr 2005 05:36:53 -0000      1.17
  +++ MdbBuilder.java   16 Apr 2005 19:01:54 -0000      1.18
  @@ -183,7 +183,7 @@
   
               //TODO go back to the commented version when possible
   //        String contextID = builder.getContainerId();
  -            String contextID = builder.getContainerId().replaceAll("[, ]", 
"_");
  +            String contextID = builder.getContainerId().replaceAll("[,: ]", 
"_");
               earContext.addSecurityContext(contextID, componentPermissions);
   
               
containerSecurityBuilder.setDetails(messageDrivenBean.getSecurityIdentity(), 
securityConfiguration, builder);
  
  
  
  1.21      +1 -7      
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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- SessionBuilder.java       16 Apr 2005 02:21:04 -0000      1.20
  +++ SessionBuilder.java       16 Apr 2005 19:01:54 -0000      1.21
  @@ -224,17 +224,11 @@
   
               //TODO go back to the commented version when possible
   //          String contextID = builder.getContainerId();
  -            String contextID = builder.getContainerId().replaceAll("[, ]", 
"_");
  +            String contextID = builder.getContainerId().replaceAll("[,: ]", 
"_");
               earContext.addSecurityContext(contextID, componentPermissions);
   
               
containerSecurityBuilder.setDetails(sessionBean.getSecurityIdentity(), 
securityConfiguration, builder);
           }
  -//        containerSecurityBuilder.fillContainerBuilderSecurity(builder,
  -//                toBeChecked,
  -//                ((EjbJarType) 
ejbModule.getSpecDD()).getAssemblyDescriptor(),
  -//                sessionBean.getEjbName().getStringValue(),
  -//                sessionBean.getSecurityIdentity(),
  -//                sessionBean.getSecurityRoleRefArray());
   
           UserTransactionImpl userTransaction;
           if 
("Bean".equals(sessionBean.getTransactionType().getStringValue())) {
  
  
  

Reply via email to