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

[djencks]

djencks     2005/11/24 18:12:03

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

  GERONIMO-1229 Use QName rather than local part in most element name searches
  
  Revision  Changes    Path
  1.62      +4 -3      
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.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- OpenEJBModuleBuilder.java 15 Nov 2005 03:59:32 -0000      1.61
  +++ OpenEJBModuleBuilder.java 24 Nov 2005 23:11:47 -0000      1.62
  @@ -145,7 +145,8 @@
       private final TransactionImportPolicyBuilder 
transactionImportPolicyBuilder;
       private final Repository repository;
       private final Kernel kernel;
  -    private static final String OPENEJBJAR_NAMESPACE = 
OpenejbOpenejbJarDocument.type.getDocumentElementName().getNamespaceURI();
  +    private static QName OPENEJBJAR_QNAME = 
OpenejbOpenejbJarDocument.type.getDocumentElementName();
  +    private static final String OPENEJBJAR_NAMESPACE = 
OPENEJBJAR_QNAME.getNamespaceURI();
   
       static {
           Map conversions = new HashMap();
  @@ -255,7 +256,7 @@
   
               // if we got one extract, adjust, and validate it otherwise 
create a default one
               if (rawPlan != null) {
  -                openejbJar = (OpenejbOpenejbJarType) 
SchemaConversionUtils.fixGeronimoSchema(rawPlan, "openejb-jar", 
OpenejbOpenejbJarType.type);
  +                openejbJar = (OpenejbOpenejbJarType) 
SchemaConversionUtils.fixGeronimoSchema(rawPlan, OPENEJBJAR_QNAME, 
OpenejbOpenejbJarType.type);
               } else {
                   String path;
                   if (standAlone) {