xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject cvs commit: xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/tylar DefaultTylarLoader.java ExplodedTylarImpl.java
Date Thu, 15 Apr 2004 22:58:45 GMT
pcal        2004/04/15 15:58:45

  Modified:    v2/src/binding/org/apache/xmlbeans/impl/binding/compile
                        Java2Schema.java
               v2/src/binding/org/apache/xmlbeans/impl/binding/tylar
                        DefaultTylarLoader.java ExplodedTylarImpl.java
  Log:
  fix a few problems in loading binary schema type systems
  
  Revision  Changes    Path
  1.50      +2 -2      xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/Java2Schema.java
  
  Index: Java2Schema.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/compile/Java2Schema.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Java2Schema.java	15 Apr 2004 20:49:17 -0000	1.49
  +++ Java2Schema.java	15 Apr 2004 22:58:44 -0000	1.50
  @@ -136,13 +136,13 @@
             throw new IllegalStateException("createSchemaTypeSystem returned null");
           }
         } catch(XmlException xe) {
  -        ExplodedTylarImpl.showXsbError(xe,null,"write",TylarConstants.SHOW_XSB_ERRORS ||
isVerbose());
  +        ExplodedTylarImpl.showXsbError(xe,null,"write",TylarConstants.SHOW_XSB_ERRORS);
         }
         if (sts != null) {
           try {
             writer.writeSchemaTypeSystem(sts);
           } catch(IOException ioe) {
  -          ExplodedTylarImpl.showXsbError(ioe,null,"compile",TylarConstants.SHOW_XSB_ERRORS
|| isVerbose());
  +          ExplodedTylarImpl.showXsbError(ioe,null,"compile",TylarConstants.SHOW_XSB_ERRORS);
           }
         }
       }
  
  
  
  1.13      +1 -1      xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/tylar/DefaultTylarLoader.java
  
  Index: DefaultTylarLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/tylar/DefaultTylarLoader.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultTylarLoader.java	15 Apr 2004 20:49:17 -0000	1.12
  +++ DefaultTylarLoader.java	15 Apr 2004 22:58:45 -0000	1.13
  @@ -204,7 +204,7 @@
       jin.close();
       if (VERBOSE) System.out.println("Done reading jar entries");
       SchemaTypeSystem sts = null;
  -    if (stsName != null) {
  +    if (stsName != null && source != null) {
         {
           try {
             URLClassLoader ucl = new URLClassLoader(new URL[] {source.toURL()});
  
  
  
  1.15      +1 -0      xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/tylar/ExplodedTylarImpl.java
  
  Index: ExplodedTylarImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/binding/org/apache/xmlbeans/impl/binding/tylar/ExplodedTylarImpl.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ExplodedTylarImpl.java	15 Apr 2004 20:49:17 -0000	1.14
  +++ ExplodedTylarImpl.java	15 Apr 2004 22:58:45 -0000	1.15
  @@ -157,6 +157,7 @@
       mJoust = joust;
       mBindingFile = bindingFile;
       mSchemaDocuments = schemas;
  +    mSchemaTypeSystem = sts;
     }
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org


Mime
View raw message