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

[djencks]

djencks     2005/10/27 23:53:41

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        OpenEJBModuleBuilder.java
  Removed:     modules/openejb-builder/src/java/org/openejb/deployment
                        OpenEJBSchemaUtils.java
  Log:

  GERONIMO-890, GERONIMO-1114 Add backwards compatibility to new security 
schema, allow unnamespaced gbeans in j2ee plans
  
  Revision  Changes    Path
  1.60      +5 -4      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- OpenEJBModuleBuilder.java 15 Oct 2005 07:44:53 -0000      1.59
  +++ OpenEJBModuleBuilder.java 28 Oct 2005 03:53:41 -0000      1.60
  @@ -93,6 +93,7 @@
   import org.apache.geronimo.kernel.repository.Repository;
   import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
   import org.apache.geronimo.schema.SchemaConversionUtils;
  +import org.apache.geronimo.schema.NamespaceElementConverter;
   import org.apache.geronimo.security.deployment.SecurityBuilder;
   import org.apache.geronimo.security.deployment.SecurityConfiguration;
   import org.apache.geronimo.security.jacc.ComponentPermissions;
  @@ -149,7 +150,7 @@
       static {
           Map conversions = new HashMap();
           QName name = EjbKeyGeneratorDocument.type.getDocumentElementName();
  -        conversions.put(name.getLocalPart(), name.getNamespaceURI());
  +        conversions.put(name.getLocalPart(), new 
NamespaceElementConverter(name.getNamespaceURI()));
           SchemaConversionUtils.registerNamespaceConversions(conversions);
       }
   
  @@ -312,10 +313,10 @@
           if (openEjbJar.isSetInverseClassloading()) {
               
earContext.setInverseClassloading(openEjbJar.getInverseClassloading());
           }
  -        
  +
           ClassFilterType[] filters = openEjbJar.getHiddenClassesArray();
           ServiceConfigBuilder.addHiddenClasses(earContext, filters);
  -        
  +
           filters = openEjbJar.getNonOverridableClassesArray();
           ServiceConfigBuilder.addNonOverridableClasses(earContext, filters);
       }