xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject cvs commit: xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans XmlBeans.java
Date Fri, 12 Nov 2004 01:37:43 GMT
radup       2004/11/11 17:37:43

  Modified:    v2/src/newstore2/org/apache/xmlbeans/impl/newstore2
                        Query.java
               v2/src/typeimpl/org/apache/xmlbeans/impl/schema
                        SchemaTypeLoaderBase.java
               v2/src/xmlpublic/org/apache/xmlbeans XmlBeans.java
  Log:
  Fixed the implementation of the 'compilePath' and 'compileQuery' methods.
  
  Revision  Changes    Path
  1.3       +8 -2      xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Query.java
  
  Index: Query.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/newstore2/org/apache/xmlbeans/impl/newstore2/Query.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Query.java	3 Nov 2004 18:04:56 -0000	1.2
  +++ Query.java	12 Nov 2004 01:37:42 -0000	1.3
  @@ -25,7 +25,7 @@
   public abstract class Query
   {
       abstract XmlObject[] execute ( Cur c, XmlOptions options );
  -    
  +
       //
       // Xqrl store specific implementation of compiled path/query
       //
  @@ -60,7 +60,13 @@
   
           return query;
       }
  -    
  +
  +    public static synchronized String compileQuery ( String queryExpr, XmlOptions options
)
  +    {
  +        getCompiledQuery( queryExpr, options );
  +        return queryExpr;
  +    }
  +
       private static Query createXqrlCompiledQuery ( String queryExpr, String currentVar
)
       {
           if (_xqrlCompileQuery == null)
  
  
  
  1.13      +2 -2      xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
  
  Index: SchemaTypeLoaderBase.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- SchemaTypeLoaderBase.java	4 Nov 2004 23:00:59 -0000	1.12
  +++ SchemaTypeLoaderBase.java	12 Nov 2004 01:37:42 -0000	1.13
  @@ -64,8 +64,8 @@
       // User-Agent: XMLBeans/2.0.0 (org.apache.xmlbeans)
       private static final String USER_AGENT = "XMLBeans/" + XmlBeans.getVersion() + " ("
+ XmlBeans.getTitle() + ")";
   
  -    private static final Method _pathCompiler = getMethod( "org.apache.xmlbeans.impl.newstore2.Path",
"getCompiledPath", new Class[] { String.class, XmlOptions.class } );
  -    private static final Method _queryCompiler = getMethod( "org.apache.xmlbeans.impl.newstore2.Query",
"getCompiledQuery", new Class[] { String.class, XmlOptions.class } );
  +    private static final Method _pathCompiler = getMethod( "org.apache.xmlbeans.impl.newstore2.Path",
"compilePath", new Class[] { String.class, XmlOptions.class } );
  +    private static final Method _queryCompiler = getMethod( "org.apache.xmlbeans.impl.newstore2.Query",
"compileQuery", new Class[] { String.class, XmlOptions.class } );
   
       private static Method getMethod ( String className, String methodName, Class[] args
)
       {
  
  
  
  1.9       +1 -1      xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
  
  Index: XmlBeans.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XmlBeans.java	8 Nov 2004 22:44:06 -0000	1.8
  +++ XmlBeans.java	12 Nov 2004 01:37:43 -0000	1.9
  @@ -45,7 +45,7 @@
           if (XMLBEANS_TITLE == null || XMLBEANS_VERSION == null || XMLBEANS_VENDOR == null)
           {
               try {
  -                throw new Exception("missing manifest information");
  +//                 throw new Exception("missing manifest information");
               }
               catch (Exception e) {
                   System.err.println("XMLBEANS DEBUG missing manifest information");
  
  
  

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


Mime
View raw message