jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject svn commit: r149514 [9/13] - in incubator/jackrabbit/site: ./ apidocs/ apidocs/org/apache/jackrabbit/core/ apidocs/org/apache/jackrabbit/core/class-use/ apidocs/org/apache/jackrabbit/core/search/ apidocs/org/apache/jackrabbit/core/search/class-use/ apidocs/org/apache/jackrabbit/core/state/class-use/ apidocs/org/apache/jackrabbit/core/state/mem/ apidocs/org/apache/jackrabbit/core/state/obj/ apidocs/org/apache/jackrabbit/core/state/xml/ apidocs/org/apache/jackrabbit/core/version/ apidocs/org/apache/jackrabbit/core/xml/ xref-test/ xref-test/org/apache/jackrabbit/test/ xref-test/org/apache/jackrabbit/test/search/ xref/ xref/org/apache/jackrabbit/core/ xref/org/apache/jackrabbit/core/nodetype/ xref/org/apache/jackrabbit/core/search/ xref/org/apache/jackrabbit/core/search/lucene/ xref/org/apache/jackrabbit/core/version/
Date Wed, 02 Feb 2005 14:05:11 GMT
Added: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/JNDIRepositoryStub.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/JNDIRepositoryStub.html?view=auto&rev=149514
==============================================================================
--- incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/JNDIRepositoryStub.html (added)
+++ incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/JNDIRepositoryStub.html Wed Feb  2 06:04:46 2005
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /><title>JNDIRepositoryStub xref</title>
+<link type="text/css" rel="stylesheet" href="../../../../stylesheet.css" />
+</head>
+<body>
+<pre>
+
+<a name="1" href="#1">1</a>   <em class="comment">/*</em>
+<a name="2" href="#2">2</a>   <em class="comment"> * Copyright 2004-2005 The Apache Software Foundation or its licensors,</em>
+<a name="3" href="#3">3</a>   <em class="comment"> *                     as applicable.</em>
+<a name="4" href="#4">4</a>   <em class="comment"> *</em>
+<a name="5" href="#5">5</a>   <em class="comment"> * Licensed under the Apache License, Version 2.0 (the "License");</em>
+<a name="6" href="#6">6</a>   <em class="comment"> * you may not use this file except in compliance with the License.</em>
+<a name="7" href="#7">7</a>   <em class="comment"> * You may obtain a copy of the License at</em>
+<a name="8" href="#8">8</a>   <em class="comment"> *</em>
+<a name="9" href="#9">9</a>   <em class="comment"> *      <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a name="10" href="#10">10</a>  <em class="comment"> *</em>
+<a name="11" href="#11">11</a>  <em class="comment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a name="12" href="#12">12</a>  <em class="comment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a name="13" href="#13">13</a>  <em class="comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a name="14" href="#14">14</a>  <em class="comment"> * See the License for the specific language governing permissions and</em>
+<a name="15" href="#15">15</a>  <em class="comment"> * limitations under the License.</em>
+<a name="16" href="#16">16</a>  <em class="comment"> */</em>
+<a name="17" href="#17">17</a>  <strong>package</strong> <a href="../../../../org/apache/jackrabbit/test/package-summary.html">org.apache.jackrabbit.test</a>;
+<a name="18" href="#18">18</a>  
+<a name="19" href="#19">19</a>  <strong>import</strong> javax.jcr.Repository;
+<a name="20" href="#20">20</a>  <strong>import</strong> javax.naming.InitialContext;
+<a name="21" href="#21">21</a>  <strong>import</strong> javax.naming.NamingException;
+<a name="22" href="#22">22</a>  <strong>import</strong> javax.rmi.PortableRemoteObject;
+<a name="23" href="#23">23</a>  <strong>import</strong> java.util.Properties;
+<a name="24" href="#24">24</a>  
+<a name="25" href="#25">25</a>  <em>/**<em>*</em></em>
+<a name="26" href="#26">26</a>  <em> * Implements the abstract class &lt;code>RepositoryStub&lt;/code> and uses JNDI</em>
+<a name="27" href="#27">27</a>  <em> * to obtain a &lt;code>javax.jcr.Repository&lt;/code> instance.</em>
+<a name="28" href="#28">28</a>  <em> */</em>
+<a name="29" href="#29">29</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/jackrabbit/test/JNDIRepositoryStub.html">JNDIRepositoryStub</a> <strong>extends</strong> <a href="../../../../org/apache/jackrabbit/test/RepositoryStub.html">RepositoryStub</a> {
+<a name="30" href="#30">30</a>  
+<a name="31" href="#31">31</a>      <strong>public</strong> <strong>static</strong> <strong>final</strong> String REPOSITORY_LOOKUP_PROP = <span class="string">"javax.jcr.tck.jndi.repository_lookup_name"</span>;
+<a name="32" href="#32">32</a>  
+<a name="33" href="#33">33</a>      <strong>private</strong> Repository repository = <strong>null</strong>;
+<a name="34" href="#34">34</a>  
+<a name="35" href="#35">35</a>      <strong>public</strong> <a href="../../../../org/apache/jackrabbit/test/JNDIRepositoryStub.html">JNDIRepositoryStub</a>(Properties env) {
+<a name="36" href="#36">36</a>          <strong>super</strong>(env);
+<a name="37" href="#37">37</a>      }
+<a name="38" href="#38">38</a>  
+<a name="39" href="#39">39</a>      <em>/**<em>*</em></em>
+<a name="40" href="#40">40</a>  <em>     * Returns a reference to the &lt;code>Repository&lt;/code> provided by this</em>
+<a name="41" href="#41">41</a>  <em>     * &lt;code>RepositoryStub&lt;/code>.</em>
+<a name="42" href="#42">42</a>  <em>     * @return</em>
+<a name="43" href="#43">43</a>  <em>     */</em>
+<a name="44" href="#44">44</a>      <strong>public</strong> <strong>synchronized</strong> Repository getRepository() throws RepositoryStubException {
+<a name="45" href="#45">45</a>          <strong>if</strong> (repository == <strong>null</strong>) {
+<a name="46" href="#46">46</a>              <strong>try</strong> {
+<a name="47" href="#47">47</a>                  String lookupName = environment.getProperty(REPOSITORY_LOOKUP_PROP);
+<a name="48" href="#48">48</a>                  <strong>if</strong> (lookupName == <strong>null</strong>) {
+<a name="49" href="#49">49</a>                      <strong>throw</strong> <strong>new</strong> <a href="../../../../org/apache/jackrabbit/test/RepositoryStubException.html">RepositoryStubException</a>(<span class="string">"Property "</span> + REPOSITORY_LOOKUP_PROP + <span class="string">" not defined!"</span>);
+<a name="50" href="#50">50</a>                  }
+<a name="51" href="#51">51</a>                  InitialContext initial = <strong>new</strong> InitialContext(environment);
+<a name="52" href="#52">52</a>                  Object obj = initial.lookup(lookupName);
+<a name="53" href="#53">53</a>  
+<a name="54" href="#54">54</a>                  repository = (Repository)PortableRemoteObject.narrow(obj, Repository.<strong>class</strong>);
+<a name="55" href="#55">55</a>  
+<a name="56" href="#56">56</a>              } <strong>catch</strong> (ClassCastException e) {
+<a name="57" href="#57">57</a>                  <em class="comment">// ClassCastException may be thrown by ProtableRemoteObject.narrow()</em>
+<a name="58" href="#58">58</a>                  <strong>throw</strong> <strong>new</strong> <a href="../../../../org/apache/jackrabbit/test/RepositoryStubException.html">RepositoryStubException</a>(<span class="string">"Object cannot be narrowed to javax.jcr.Repository: "</span> + e);
+<a name="59" href="#59">59</a>              } <strong>catch</strong> (NamingException e) {
+<a name="60" href="#60">60</a>                  <strong>throw</strong> <strong>new</strong> <a href="../../../../org/apache/jackrabbit/test/RepositoryStubException.html">RepositoryStubException</a>(e.getMessage());
+<a name="61" href="#61">61</a>              }
+<a name="62" href="#62">62</a>          }
+<a name="63" href="#63">63</a>          <strong>return</strong> repository;
+<a name="64" href="#64">64</a>      }
+<a name="65" href="#65">65</a>  
+<a name="66" href="#66">66</a>  }
+</pre>
+<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
+</html>
+

Propchange: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/JNDIRepositoryStub.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/RepositoryStub.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/RepositoryStub.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/RepositoryStub.html (original)
+++ incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/RepositoryStub.html Wed Feb  2 06:04:46 2005
@@ -96,12 +96,12 @@
 <a name="87" href="#87">87</a>              <strong>throw</strong> <strong>new</strong> IllegalArgumentException(<span class="string">"Parameter 'env' must not be null!"</span>);
 <a name="88" href="#88">88</a>          }
 <a name="89" href="#89">89</a>          environment = env;
-<a name="90" href="#90">90</a>          superuser = <strong>new</strong> SimpleCredentials(env.getProperty(PROP_SUPERUSER_NAME, <span class="string">""</span>),
-<a name="91" href="#91">91</a>                  env.getProperty(PROP_SUPERUSER_PWD, <span class="string">""</span>).toCharArray());
-<a name="92" href="#92">92</a>          readonly = <strong>new</strong> SimpleCredentials(env.getProperty(PROP_READONLY_NAME, <span class="string">""</span>),
-<a name="93" href="#93">93</a>                  env.getProperty(PROP_READONLY_PWD, <span class="string">""</span>).toCharArray());
-<a name="94" href="#94">94</a>          readwrite = <strong>new</strong> SimpleCredentials(env.getProperty(PROP_READWRITE_NAME, <span class="string">""</span>),
-<a name="95" href="#95">95</a>                  env.getProperty(PROP_READWRITE_PWD, <span class="string">""</span>).toCharArray());
+<a name="90" href="#90">90</a>          superuser = <strong>new</strong> SimpleCredentials(env.getProperty(PROP_PREFIX + <span class="string">"."</span> + PROP_SUPERUSER_NAME, <span class="string">""</span>),
+<a name="91" href="#91">91</a>                  env.getProperty(PROP_PREFIX + <span class="string">"."</span> + PROP_SUPERUSER_PWD, <span class="string">""</span>).toCharArray());
+<a name="92" href="#92">92</a>          readonly = <strong>new</strong> SimpleCredentials(env.getProperty(PROP_PREFIX + <span class="string">"."</span> + PROP_READONLY_NAME, <span class="string">""</span>),
+<a name="93" href="#93">93</a>                  env.getProperty(PROP_PREFIX + <span class="string">"."</span> + PROP_READONLY_PWD, <span class="string">""</span>).toCharArray());
+<a name="94" href="#94">94</a>          readwrite = <strong>new</strong> SimpleCredentials(env.getProperty(PROP_PREFIX + <span class="string">"."</span> + PROP_READWRITE_NAME, <span class="string">""</span>),
+<a name="95" href="#95">95</a>                  env.getProperty(PROP_PREFIX + <span class="string">"."</span> + PROP_READWRITE_PWD, <span class="string">""</span>).toCharArray());
 <a name="96" href="#96">96</a>      }
 <a name="97" href="#97">97</a>  
 <a name="98" href="#98">98</a>      <em>/**<em>*</em></em>

Modified: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/package-frame.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/package-frame.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/package-frame.html (original)
+++ incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/package-frame.html Wed Feb  2 06:04:46 2005
@@ -22,6 +22,10 @@
           </li>
         
           <li>
+            <a href="JNDIRepositoryStub.html" target="classFrame">JNDIRepositoryStub</a>
+          </li>
+        
+          <li>
             <a href="JUnitTest.html" target="classFrame">JUnitTest</a>
           </li>
         

Modified: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/package-summary.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/package-summary.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/package-summary.html (original)
+++ incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/package-summary.html Wed Feb  2 06:04:46 2005
@@ -65,6 +65,12 @@
           
             <tr>
               <td>
+                <a href="JNDIRepositoryStub.html" target="classFrame">JNDIRepositoryStub</a>
+              </td>
+            </tr>
+          
+            <tr>
+              <td>
                 <a href="JUnitTest.html" target="classFrame">JUnitTest</a>
               </td>
             </tr>

Modified: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/AbstractQueryTest.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/AbstractQueryTest.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/AbstractQueryTest.html (original)
+++ incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/AbstractQueryTest.html Wed Feb  2 06:04:46 2005
@@ -29,92 +29,86 @@
 <a name="20" href="#20">20</a>  
 <a name="21" href="#21">21</a>  <strong>import</strong> javax.jcr.*;
 <a name="22" href="#22">22</a>  <strong>import</strong> javax.jcr.query.QueryResult;
-<a name="23" href="#23">23</a>  
-<a name="24" href="#24">24</a>  <em>/**<em>*</em></em>
-<a name="25" href="#25">25</a>  <em> * Abstract base class for query test cases.</em>
-<a name="26" href="#26">26</a>  <em> */</em>
-<a name="27" href="#27">27</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../../org/apache/jackrabbit/test/search/AbstractQueryTest.html">AbstractQueryTest</a> <strong>extends</strong> <a href="../../../../../org/apache/jackrabbit/test/AbstractJCRTest.html">AbstractJCRTest</a> {
-<a name="28" href="#28">28</a>  
-<a name="29" href="#29">29</a>      <em>/**<em>*</em></em>
-<a name="30" href="#30">30</a>  <em>     * Overwrites the &lt;code>setUp&lt;/code> method from </em>
-<a name="31" href="#31">31</a>  <em>     * {@link org.apache.jackrabbit.test.AbstractJCRTest} and adds additional</em>
-<a name="32" href="#32">32</a>  <em>     * setup code.</em>
-<a name="33" href="#33">33</a>  <em>     * @throws Exception if an error occurs during setup.</em>
-<a name="34" href="#34">34</a>  <em>     */</em>
-<a name="35" href="#35">35</a>      <strong>protected</strong> <strong>void</strong> setUp() throws Exception {
-<a name="36" href="#36">36</a>          <strong>super</strong>.setUp();
-<a name="37" href="#37">37</a>          <em class="comment">// make sure root node is indexed</em>
-<a name="38" href="#38">38</a>          superuser.getRootNode().setProperty(<span class="string">"dummy"</span>, <strong>new</strong> String[]{<span class="string">"dummy"</span>});
-<a name="39" href="#39">39</a>          superuser.getRootNode().save();
-<a name="40" href="#40">40</a>      }
-<a name="41" href="#41">41</a>  
-<a name="42" href="#42">42</a>      <em>/**<em>*</em></em>
-<a name="43" href="#43">43</a>  <em>     * Checks if the &lt;code>result&lt;/code> contains a number of &lt;code>hits&lt;/code>.</em>
-<a name="44" href="#44">44</a>  <em>     *</em>
-<a name="45" href="#45">45</a>  <em>     * @param result the &lt;code>QueryResult&lt;/code>.</em>
-<a name="46" href="#46">46</a>  <em>     * @param hits   the number of expected hits.</em>
-<a name="47" href="#47">47</a>  <em>     * @throws RepositoryException if an error occurs while iterating over</em>
-<a name="48" href="#48">48</a>  <em>     *                             the result nodes.</em>
-<a name="49" href="#49">49</a>  <em>     */</em>
-<a name="50" href="#50">50</a>      <strong>protected</strong> <strong>void</strong> checkResult(QueryResult result, <strong>int</strong> hits)
-<a name="51" href="#51">51</a>              throws RepositoryException {
-<a name="52" href="#52">52</a>          <strong>int</strong> count = 0;
-<a name="53" href="#53">53</a>          log.println(<span class="string">"Nodes:"</span>);
-<a name="54" href="#54">54</a>          <strong>for</strong> (NodeIterator nodes = result.getNodes(); nodes.hasNext(); count++) {
-<a name="55" href="#55">55</a>              Node n = nodes.nextNode();
-<a name="56" href="#56">56</a>              log.println(<span class="string">" "</span> + n.getPath());
-<a name="57" href="#57">57</a>          }
-<a name="58" href="#58">58</a>          <strong>if</strong> (count == 0) {
-<a name="59" href="#59">59</a>              log.println(<span class="string">" NONE"</span>);
-<a name="60" href="#60">60</a>          }
-<a name="61" href="#61">61</a>          assertEquals(<span class="string">"Wrong hit count."</span>, hits, count);
-<a name="62" href="#62">62</a>      }
-<a name="63" href="#63">63</a>  
-<a name="64" href="#64">64</a>      <em>/**<em>*</em></em>
-<a name="65" href="#65">65</a>  <em>     * Checks if the &lt;code>result&lt;/code> contains a number of &lt;code>hits&lt;/code></em>
-<a name="66" href="#66">66</a>  <em>     * and &lt;code>properties&lt;/code>.</em>
-<a name="67" href="#67">67</a>  <em>     *</em>
-<a name="68" href="#68">68</a>  <em>     * @param result     the &lt;code>QueryResult&lt;/code>.</em>
-<a name="69" href="#69">69</a>  <em>     * @param hits       the number of expected hits.</em>
-<a name="70" href="#70">70</a>  <em>     * @param properties the number of expected properties.</em>
-<a name="71" href="#71">71</a>  <em>     * @throws RepositoryException if an error occurs while iterating over</em>
-<a name="72" href="#72">72</a>  <em>     *                             the result nodes.</em>
-<a name="73" href="#73">73</a>  <em>     */</em>
-<a name="74" href="#74">74</a>      <strong>protected</strong> <strong>void</strong> checkResult(QueryResult result, <strong>int</strong> hits, <strong>int</strong> properties)
-<a name="75" href="#75">75</a>              throws RepositoryException {
-<a name="76" href="#76">76</a>  <em class="comment">/*</em>
-<a name="77" href="#77">77</a>  <em class="comment">        checkResult(result, hits);</em>
-<a name="78" href="#78">78</a>  <em class="comment">        // now check property count</em>
-<a name="79" href="#79">79</a>  <em class="comment">        int count = 0;</em>
-<a name="80" href="#80">80</a>  <em class="comment">        log.println("Properties:");</em>
-<a name="81" href="#81">81</a>  <em class="comment">        for (PropertyIterator it = result.getProperties(); it.hasNext(); count++) {</em>
-<a name="82" href="#82">82</a>  <em class="comment">            StringBuffer msg = new StringBuffer();</em>
-<a name="83" href="#83">83</a>  <em class="comment">            Property p = it.nextProperty();</em>
-<a name="84" href="#84">84</a>  <em class="comment">            msg.append("  ").append(p.getName()).append(": ");</em>
-<a name="85" href="#85">85</a>  <em class="comment">            Value[] values = null;</em>
-<a name="86" href="#86">86</a>  <em class="comment">            if (p.getDefinition().isMultiple()) {</em>
-<a name="87" href="#87">87</a>  <em class="comment">                values = p.getValues();</em>
-<a name="88" href="#88">88</a>  <em class="comment">            } else {</em>
-<a name="89" href="#89">89</a>  <em class="comment">                values = new Value[]{p.getValue()};</em>
-<a name="90" href="#90">90</a>  <em class="comment">            }</em>
-<a name="91" href="#91">91</a>  <em class="comment">            String sep = "";</em>
-<a name="92" href="#92">92</a>  <em class="comment">            for (int i = 0; i &lt; values.length; i++) {</em>
-<a name="93" href="#93">93</a>  <em class="comment">                msg.append(sep);</em>
-<a name="94" href="#94">94</a>  <em class="comment">                msg.append(values[i].getString());</em>
-<a name="95" href="#95">95</a>  <em class="comment">                sep = " | ";</em>
-<a name="96" href="#96">96</a>  <em class="comment">            }</em>
-<a name="97" href="#97">97</a>  <em class="comment">            log.println(msg);</em>
-<a name="98" href="#98">98</a>  <em class="comment">        }</em>
-<a name="99" href="#99">99</a>  <em class="comment">        if (count == 0) {</em>
-<a name="100" href="#100">100</a> <em class="comment">            log.println("  NONE");</em>
-<a name="101" href="#101">101</a> <em class="comment">        }</em>
-<a name="102" href="#102">102</a> <em class="comment">        assertEquals("Wrong property count.", properties, count);</em>
-<a name="103" href="#103">103</a> <em class="comment">*/</em>
-<a name="104" href="#104">104</a>         <em class="comment">//@todo rewrite test case</em>
-<a name="105" href="#105">105</a>         fail(<span class="string">"need to rewrite test case according to interface change"</span>);
-<a name="106" href="#106">106</a>     }
-<a name="107" href="#107">107</a> 
-<a name="108" href="#108">108</a> }
+<a name="23" href="#23">23</a>  <strong>import</strong> javax.jcr.query.RowIterator;
+<a name="24" href="#24">24</a>  <strong>import</strong> javax.jcr.query.Row;
+<a name="25" href="#25">25</a>  
+<a name="26" href="#26">26</a>  <em>/**<em>*</em></em>
+<a name="27" href="#27">27</a>  <em> * Abstract base class for query test cases.</em>
+<a name="28" href="#28">28</a>  <em> */</em>
+<a name="29" href="#29">29</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../../org/apache/jackrabbit/test/search/AbstractQueryTest.html">AbstractQueryTest</a> <strong>extends</strong> <a href="../../../../../org/apache/jackrabbit/test/AbstractJCRTest.html">AbstractJCRTest</a> {
+<a name="30" href="#30">30</a>  
+<a name="31" href="#31">31</a>      <em>/**<em>*</em></em>
+<a name="32" href="#32">32</a>  <em>     * Overwrites the &lt;code>setUp&lt;/code> method from </em>
+<a name="33" href="#33">33</a>  <em>     * {@link org.apache.jackrabbit.test.AbstractJCRTest} and adds additional</em>
+<a name="34" href="#34">34</a>  <em>     * setup code.</em>
+<a name="35" href="#35">35</a>  <em>     * @throws Exception if an error occurs during setup.</em>
+<a name="36" href="#36">36</a>  <em>     */</em>
+<a name="37" href="#37">37</a>      <strong>protected</strong> <strong>void</strong> setUp() throws Exception {
+<a name="38" href="#38">38</a>          <strong>super</strong>.setUp();
+<a name="39" href="#39">39</a>          <em class="comment">// make sure root node is indexed</em>
+<a name="40" href="#40">40</a>          superuser.getRootNode().setProperty(<span class="string">"dummy"</span>, <strong>new</strong> String[]{<span class="string">"dummy"</span>});
+<a name="41" href="#41">41</a>          superuser.getRootNode().save();
+<a name="42" href="#42">42</a>      }
+<a name="43" href="#43">43</a>  
+<a name="44" href="#44">44</a>      <em>/**<em>*</em></em>
+<a name="45" href="#45">45</a>  <em>     * Checks if the &lt;code>result&lt;/code> contains a number of &lt;code>hits&lt;/code>.</em>
+<a name="46" href="#46">46</a>  <em>     *</em>
+<a name="47" href="#47">47</a>  <em>     * @param result the &lt;code>QueryResult&lt;/code>.</em>
+<a name="48" href="#48">48</a>  <em>     * @param hits   the number of expected hits.</em>
+<a name="49" href="#49">49</a>  <em>     * @throws RepositoryException if an error occurs while iterating over</em>
+<a name="50" href="#50">50</a>  <em>     *                             the result nodes.</em>
+<a name="51" href="#51">51</a>  <em>     */</em>
+<a name="52" href="#52">52</a>      <strong>protected</strong> <strong>void</strong> checkResult(QueryResult result, <strong>int</strong> hits)
+<a name="53" href="#53">53</a>              throws RepositoryException {
+<a name="54" href="#54">54</a>          <strong>int</strong> count = 0;
+<a name="55" href="#55">55</a>          log.println(<span class="string">"Nodes:"</span>);
+<a name="56" href="#56">56</a>          <strong>for</strong> (NodeIterator nodes = result.getNodes(); nodes.hasNext(); count++) {
+<a name="57" href="#57">57</a>              Node n = nodes.nextNode();
+<a name="58" href="#58">58</a>              log.println(<span class="string">" "</span> + n.getPath());
+<a name="59" href="#59">59</a>          }
+<a name="60" href="#60">60</a>          <strong>if</strong> (count == 0) {
+<a name="61" href="#61">61</a>              log.println(<span class="string">" NONE"</span>);
+<a name="62" href="#62">62</a>          }
+<a name="63" href="#63">63</a>          assertEquals(<span class="string">"Wrong hit count."</span>, hits, count);
+<a name="64" href="#64">64</a>      }
+<a name="65" href="#65">65</a>  
+<a name="66" href="#66">66</a>      <em>/**<em>*</em></em>
+<a name="67" href="#67">67</a>  <em>     * Checks if the &lt;code>result&lt;/code> contains a number of &lt;code>hits&lt;/code></em>
+<a name="68" href="#68">68</a>  <em>     * and &lt;code>properties&lt;/code>.</em>
+<a name="69" href="#69">69</a>  <em>     *</em>
+<a name="70" href="#70">70</a>  <em>     * @param result     the &lt;code>QueryResult&lt;/code>.</em>
+<a name="71" href="#71">71</a>  <em>     * @param hits       the number of expected hits.</em>
+<a name="72" href="#72">72</a>  <em>     * @param properties the number of expected properties.</em>
+<a name="73" href="#73">73</a>  <em>     * @throws RepositoryException if an error occurs while iterating over</em>
+<a name="74" href="#74">74</a>  <em>     *                             the result nodes.</em>
+<a name="75" href="#75">75</a>  <em>     */</em>
+<a name="76" href="#76">76</a>      <strong>protected</strong> <strong>void</strong> checkResult(QueryResult result, <strong>int</strong> hits, <strong>int</strong> properties)
+<a name="77" href="#77">77</a>              throws RepositoryException {
+<a name="78" href="#78">78</a>          checkResult(result, hits);
+<a name="79" href="#79">79</a>          <em class="comment">// now check property count</em>
+<a name="80" href="#80">80</a>          <strong>int</strong> count = 0;
+<a name="81" href="#81">81</a>          log.println(<span class="string">"Properties:"</span>);
+<a name="82" href="#82">82</a>          String[] propNames = result.getPropertyNames();
+<a name="83" href="#83">83</a>          <strong>for</strong> (RowIterator it = result.getRows(); it.hasNext();) {
+<a name="84" href="#84">84</a>              StringBuffer msg = <strong>new</strong> StringBuffer();
+<a name="85" href="#85">85</a>              Value[] values = it.nextRow().getValues();
+<a name="86" href="#86">86</a>              <strong>for</strong> (<strong>int</strong> i = 0; i &lt; propNames.length; i++, count++) {
+<a name="87" href="#87">87</a>                  msg.append(<span class="string">"  "</span>).append(propNames[i]).append(<span class="string">": "</span>);
+<a name="88" href="#88">88</a>                  <strong>if</strong> (values[i] == <strong>null</strong>) {
+<a name="89" href="#89">89</a>                      msg.append(<span class="string">"null"</span>);
+<a name="90" href="#90">90</a>                  } <strong>else</strong> {
+<a name="91" href="#91">91</a>                      msg.append(values[i].getString());
+<a name="92" href="#92">92</a>                  }
+<a name="93" href="#93">93</a>              }
+<a name="94" href="#94">94</a>              log.println(msg);
+<a name="95" href="#95">95</a>          }
+<a name="96" href="#96">96</a>          <strong>if</strong> (count == 0) {
+<a name="97" href="#97">97</a>              log.println(<span class="string">"  NONE"</span>);
+<a name="98" href="#98">98</a>          }
+<a name="99" href="#99">99</a>          assertEquals(<span class="string">"Wrong property count."</span>, properties, count);
+<a name="100" href="#100">100</a>     }
+<a name="101" href="#101">101</a> 
+<a name="102" href="#102">102</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/FulltextQueryTest.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/FulltextQueryTest.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/FulltextQueryTest.html (original)
+++ incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/FulltextQueryTest.html Wed Feb  2 06:04:46 2005
@@ -43,7 +43,7 @@
 <a name="34" href="#34">34</a>          String sql = <span class="string">"SELECT * FROM \&quot;"</span> + NT_UNSTRUCTURED
 <a name="35" href="#35">35</a>                  + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%"</span>
 <a name="36" href="#36">36</a>                  + <span class="string">"' AND CONTAINS('fox')"</span>;
-<a name="37" href="#37">37</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="37" href="#37">37</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="38" href="#38">38</a>          QueryResult result = q.execute();
 <a name="39" href="#39">39</a>          checkResult(result, 1);
 <a name="40" href="#40">40</a>      }
@@ -57,7 +57,7 @@
 <a name="48" href="#48">48</a>          String sql = <span class="string">"SELECT * FROM \&quot;"</span> + NT_UNSTRUCTURED
 <a name="49" href="#49">49</a>                  + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; = '"</span> + testRoot + <span class="string">"/foo"</span>
 <a name="50" href="#50">50</a>                  + <span class="string">"' AND CONTAINS('fox')"</span>;
-<a name="51" href="#51">51</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="51" href="#51">51</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="52" href="#52">52</a>          QueryResult result = q.execute();
 <a name="53" href="#53">53</a>          checkResult(result, 1);
 <a name="54" href="#54">54</a>      }
@@ -76,7 +76,7 @@
 <a name="67" href="#67">67</a>          String sql = <span class="string">"SELECT * FROM \&quot;"</span> + NT_UNSTRUCTURED
 <a name="68" href="#68">68</a>                  + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%"</span>
 <a name="69" href="#69">69</a>                  + <span class="string">"' AND CONTAINS('fox test')"</span>;
-<a name="70" href="#70">70</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="70" href="#70">70</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="71" href="#71">71</a>          QueryResult result = q.execute();
 <a name="72" href="#72">72</a>          checkResult(result, 1);
 <a name="73" href="#73">73</a>      }
@@ -95,7 +95,7 @@
 <a name="86" href="#86">86</a>          String sql = <span class="string">"SELECT * FROM \&quot;"</span> + NT_UNSTRUCTURED
 <a name="87" href="#87">87</a>                  + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%"</span>
 <a name="88" href="#88">88</a>                  + <span class="string">"' AND CONTAINS('text ''fox jumps''')"</span>;
-<a name="89" href="#89">89</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="89" href="#89">89</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="90" href="#90">90</a>          QueryResult result = q.execute();
 <a name="91" href="#91">91</a>          checkResult(result, 1);
 <a name="92" href="#92">92</a>      }
@@ -114,7 +114,7 @@
 <a name="105" href="#105">105</a>         String sql = <span class="string">"SELECT * FROM \&quot;"</span> + NT_UNSTRUCTURED
 <a name="106" href="#106">106</a>                 + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%"</span>
 <a name="107" href="#107">107</a>                 + <span class="string">"' AND CONTAINS('text ''fox jumps'' -other')"</span>;
-<a name="108" href="#108">108</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="108" href="#108">108</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="109" href="#109">109</a>         QueryResult result = q.execute();
 <a name="110" href="#110">110</a>         checkResult(result, 1);
 <a name="111" href="#111">111</a>     }
@@ -133,7 +133,7 @@
 <a name="124" href="#124">124</a>         String sql = <span class="string">"SELECT * FROM \&quot;"</span> + NT_UNSTRUCTURED
 <a name="125" href="#125">125</a>                 + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%"</span>
 <a name="126" href="#126">126</a>                 + <span class="string">"' AND CONTAINS('''fox jumps'' test OR other')"</span>;
-<a name="127" href="#127">127</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="127" href="#127">127</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="128" href="#128">128</a>         QueryResult result = q.execute();
 <a name="129" href="#129">129</a>         checkResult(result, 2);
 <a name="130" href="#130">130</a>     }
@@ -152,7 +152,7 @@
 <a name="143" href="#143">143</a>         String sql = <span class="string">"SELECT * FROM \&quot;"</span> + NT_UNSTRUCTURED
 <a name="144" href="#144">144</a>                 + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%"</span>
 <a name="145" href="#145">145</a>                 + <span class="string">"' AND CONTAINS('''fox juMps'' Test OR otheR')"</span>;
-<a name="146" href="#146">146</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="146" href="#146">146</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="147" href="#147">147</a>         QueryResult result = q.execute();
 <a name="148" href="#148">148</a>         checkResult(result, 2);
 <a name="149" href="#149">149</a>     }

Modified: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/OrderByTest.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/OrderByTest.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/OrderByTest.html (original)
+++ incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/OrderByTest.html Wed Feb  2 06:04:46 2005
@@ -132,7 +132,7 @@
 <a name="123" href="#123">123</a>         <em class="comment">// both ascending</em>
 <a name="124" href="#124">124</a>         String sql = <span class="string">"SELECT value FROM nt:unstructured WHERE "</span> +
 <a name="125" href="#125">125</a>                 <span class="string">"jcr:path LIKE '/"</span> + testRoot + <span class="string">"/%' ORDER BY value, text"</span>;
-<a name="126" href="#126">126</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="126" href="#126">126</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="127" href="#127">127</a>         QueryResult result = q.execute();
 <a name="128" href="#128">128</a>         checkResultOrder(result, <strong>new</strong> String[]{<span class="string">"node2"</span>, <span class="string">"node3"</span>, <span class="string">"node1"</span>});
 <a name="129" href="#129">129</a> 
@@ -144,7 +144,7 @@
 <a name="135" href="#135">135</a>         <em class="comment">// both descending</em>
 <a name="136" href="#136">136</a>         sql = <span class="string">"SELECT value FROM nt:unstructured WHERE "</span> +
 <a name="137" href="#137">137</a>                 <span class="string">"jcr:path LIKE '/"</span> + testRoot + <span class="string">"/%' ORDER BY value DESC, text DESC"</span>;
-<a name="138" href="#138">138</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="138" href="#138">138</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="139" href="#139">139</a>         result = q.execute();
 <a name="140" href="#140">140</a>         checkResultOrder(result, <strong>new</strong> String[]{<span class="string">"node1"</span>, <span class="string">"node3"</span>, <span class="string">"node2"</span>});
 <a name="141" href="#141">141</a> 
@@ -156,7 +156,7 @@
 <a name="147" href="#147">147</a>         <em class="comment">// mixed ascending and descending</em>
 <a name="148" href="#148">148</a>         sql = <span class="string">"SELECT value FROM nt:unstructured WHERE "</span> +
 <a name="149" href="#149">149</a>                 <span class="string">"jcr:path LIKE '/"</span> + testRoot + <span class="string">"/%' ORDER BY value DESC, text"</span>;
-<a name="150" href="#150">150</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="150" href="#150">150</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="151" href="#151">151</a>         result = q.execute();
 <a name="152" href="#152">152</a>         checkResultOrder(result, <strong>new</strong> String[]{<span class="string">"node1"</span>, <span class="string">"node2"</span>, <span class="string">"node3"</span>});
 <a name="153" href="#153">153</a> 
@@ -208,7 +208,7 @@
 <a name="199" href="#199">199</a>         <em class="comment">// first check ascending</em>
 <a name="200" href="#200">200</a>         String sql = <span class="string">"SELECT value FROM nt:unstructured WHERE "</span> +
 <a name="201" href="#201">201</a>                 <span class="string">"jcr:path LIKE '/"</span> + testRoot + <span class="string">"/%' ORDER BY value"</span>;
-<a name="202" href="#202">202</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="202" href="#202">202</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="203" href="#203">203</a>         QueryResult result = q.execute();
 <a name="204" href="#204">204</a>         checkResultOrder(result, nodeNames);
 <a name="205" href="#205">205</a> 
@@ -222,7 +222,7 @@
 <a name="213" href="#213">213</a> 
 <a name="214" href="#214">214</a>         sql = <span class="string">"SELECT value FROM nt:unstructured WHERE "</span> +
 <a name="215" href="#215">215</a>                 <span class="string">"jcr:path LIKE '/"</span> + testRoot + <span class="string">"/%' ORDER BY value DESC"</span>;
-<a name="216" href="#216">216</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="216" href="#216">216</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="217" href="#217">217</a>         result = q.execute();
 <a name="218" href="#218">218</a>         checkResultOrder(result, nodeNames);
 <a name="219" href="#219">219</a> 

Modified: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SQLTest.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SQLTest.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SQLTest.html (original)
+++ incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SQLTest.html Wed Feb  2 06:04:46 2005
@@ -41,7 +41,7 @@
 <a name="32" href="#32">32</a>          testRootNode.save();
 <a name="33" href="#33">33</a>  
 <a name="34" href="#34">34</a>          String sql = <span class="string">"SELECT * FROM \&quot;nt:unstructured\&quot; WHERE bla='bla'"</span>;
-<a name="35" href="#35">35</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="35" href="#35">35</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="36" href="#36">36</a>          QueryResult result = q.execute();
 <a name="37" href="#37">37</a>          checkResult(result, 1);
 <a name="38" href="#38">38</a>      }
@@ -53,7 +53,7 @@
 <a name="44" href="#44">44</a>          testRootNode.save();
 <a name="45" href="#45">45</a>  
 <a name="46" href="#46">46</a>          String sql = <span class="string">"SELECT * FROM \&quot;nt:unstructured\&quot; WHERE contains('fox')"</span>;
-<a name="47" href="#47">47</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="47" href="#47">47</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="48" href="#48">48</a>          QueryResult result = q.execute();
 <a name="49" href="#49">49</a>          checkResult(result, 1);
 <a name="50" href="#50">50</a>      }
@@ -65,7 +65,7 @@
 <a name="56" href="#56">56</a>          testRootNode.save();
 <a name="57" href="#57">57</a>  
 <a name="58" href="#58">58</a>          String sql = <span class="string">"SELECT * FROM \&quot;nt:unstructured\&quot; WHERE contains('fox') AND NOT contains('bla')"</span>;
-<a name="59" href="#59">59</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="59" href="#59">59</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="60" href="#60">60</a>          QueryResult result = q.execute();
 <a name="61" href="#61">61</a>          checkResult(result, 1);
 <a name="62" href="#62">62</a>      }

Modified: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SelectClauseTest.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SelectClauseTest.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SelectClauseTest.html (original)
+++ incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SelectClauseTest.html Wed Feb  2 06:04:46 2005
@@ -37,82 +37,82 @@
 <a name="28" href="#28">28</a>  
 <a name="29" href="#29">29</a>      <strong>public</strong> <strong>void</strong> testSelectSQL() throws RepositoryException {
 <a name="30" href="#30">30</a>          Node n = testRootNode.addNode(<span class="string">"node1"</span>, NT_UNSTRUCTURED);
-<a name="31" href="#31">31</a>          n.setProperty(<span class="string">"myvalue"</span>, <strong>new</strong> String[]{<span class="string">"foo"</span>});
+<a name="31" href="#31">31</a>          n.setProperty(<span class="string">"myvalue"</span>, <span class="string">"foo"</span>);
 <a name="32" href="#32">32</a>          n = testRootNode.addNode(<span class="string">"node2"</span>, NT_UNSTRUCTURED);
-<a name="33" href="#33">33</a>          n.setProperty(<span class="string">"myvalue"</span>, <strong>new</strong> String[]{<span class="string">"bar"</span>});
+<a name="33" href="#33">33</a>          n.setProperty(<span class="string">"myvalue"</span>, <span class="string">"bar"</span>);
 <a name="34" href="#34">34</a>          n = testRootNode.addNode(<span class="string">"node3"</span>, NT_UNSTRUCTURED);
-<a name="35" href="#35">35</a>          n.setProperty(<span class="string">"yourvalue"</span>, <strong>new</strong> String[]{<span class="string">"foo"</span>});
+<a name="35" href="#35">35</a>          n.setProperty(<span class="string">"yourvalue"</span>, <span class="string">"foo"</span>);
 <a name="36" href="#36">36</a>  
 <a name="37" href="#37">37</a>          testRootNode.save();
 <a name="38" href="#38">38</a>  
 <a name="39" href="#39">39</a>          String sql = <span class="string">"SELECT myvalue FROM \&quot;"</span> + NT_BASE
 <a name="40" href="#40">40</a>                  + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%'"</span>;
-<a name="41" href="#41">41</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="41" href="#41">41</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="42" href="#42">42</a>          QueryResult result = q.execute();
 <a name="43" href="#43">43</a>          checkResult(result, 2);
 <a name="44" href="#44">44</a>  
 <a name="45" href="#45">45</a>          sql = <span class="string">"SELECT myvalue FROM \&quot;"</span> + NT_BASE
 <a name="46" href="#46">46</a>                  + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%'"</span>
 <a name="47" href="#47">47</a>                  + <span class="string">" AND yourvalue = 'foo'"</span>;
-<a name="48" href="#48">48</a>          q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="48" href="#48">48</a>          q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="49" href="#49">49</a>          result = q.execute();
 <a name="50" href="#50">50</a>          checkResult(result, 0);
 <a name="51" href="#51">51</a>  
 <a name="52" href="#52">52</a>          sql = <span class="string">"SELECT myvalue FROM \&quot;"</span> + NT_BASE + <span class="string">"\&quot;"</span>;
-<a name="53" href="#53">53</a>          q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="53" href="#53">53</a>          q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="54" href="#54">54</a>          result = q.execute();
 <a name="55" href="#55">55</a>          checkResult(result, 2);
 <a name="56" href="#56">56</a>      }
 <a name="57" href="#57">57</a>  
 <a name="58" href="#58">58</a>      <strong>public</strong> <strong>void</strong> testPropertyCountSQL() throws RepositoryException {
 <a name="59" href="#59">59</a>          Node n = testRootNode.addNode(<span class="string">"node1"</span>, NT_UNSTRUCTURED);
-<a name="60" href="#60">60</a>          n.setProperty(<span class="string">"myvalue"</span>, <strong>new</strong> String[]{<span class="string">"foo"</span>});
+<a name="60" href="#60">60</a>          n.setProperty(<span class="string">"myvalue"</span>, <span class="string">"foo"</span>);
 <a name="61" href="#61">61</a>          n = testRootNode.addNode(<span class="string">"node2"</span>, NT_UNSTRUCTURED);
-<a name="62" href="#62">62</a>          n.setProperty(<span class="string">"myvalue"</span>, <strong>new</strong> String[]{<span class="string">"bar"</span>});
+<a name="62" href="#62">62</a>          n.setProperty(<span class="string">"myvalue"</span>, <span class="string">"bar"</span>);
 <a name="63" href="#63">63</a>          n = testRootNode.addNode(<span class="string">"node3"</span>, NT_UNSTRUCTURED);
-<a name="64" href="#64">64</a>          n.setProperty(<span class="string">"yourvalue"</span>, <strong>new</strong> String[]{<span class="string">"foo"</span>});
+<a name="64" href="#64">64</a>          n.setProperty(<span class="string">"yourvalue"</span>, <span class="string">"foo"</span>);
 <a name="65" href="#65">65</a>  
 <a name="66" href="#66">66</a>          testRootNode.save();
 <a name="67" href="#67">67</a>  
 <a name="68" href="#68">68</a>          String sql = <span class="string">"SELECT myvalue FROM \&quot;"</span> + NT_BASE
 <a name="69" href="#69">69</a>                  + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%'"</span>;
-<a name="70" href="#70">70</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="70" href="#70">70</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="71" href="#71">71</a>          QueryResult result = q.execute();
 <a name="72" href="#72">72</a>          checkResult(result, 2, 2);
 <a name="73" href="#73">73</a>  
 <a name="74" href="#74">74</a>          sql = <span class="string">"SELECT myvalue FROM \&quot;"</span> + NT_BASE
 <a name="75" href="#75">75</a>                  + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%'"</span>
 <a name="76" href="#76">76</a>                  + <span class="string">" AND yourvalue = 'foo'"</span>;
-<a name="77" href="#77">77</a>          q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="77" href="#77">77</a>          q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="78" href="#78">78</a>          result = q.execute();
 <a name="79" href="#79">79</a>          checkResult(result, 0, 0);
 <a name="80" href="#80">80</a>  
 <a name="81" href="#81">81</a>          sql = <span class="string">"SELECT myvalue FROM \&quot;"</span> + NT_BASE + <span class="string">"\&quot;"</span>;
-<a name="82" href="#82">82</a>          q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="82" href="#82">82</a>          q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="83" href="#83">83</a>          result = q.execute();
 <a name="84" href="#84">84</a>          checkResult(result, 2, 2);
 <a name="85" href="#85">85</a>  
 <a name="86" href="#86">86</a>          sql = <span class="string">"SELECT * FROM \&quot;"</span> + NT_BASE
 <a name="87" href="#87">87</a>                  + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/%'"</span>
 <a name="88" href="#88">88</a>                  + <span class="string">" AND myvalue LIKE '%'"</span>;
-<a name="89" href="#89">89</a>          q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="89" href="#89">89</a>          q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="90" href="#90">90</a>          result = q.execute();
-<a name="91" href="#91">91</a>          checkResult(result, 2, 4);
+<a name="91" href="#91">91</a>          checkResult(result, 2, 2);
 <a name="92" href="#92">92</a>      }
 <a name="93" href="#93">93</a>  
 <a name="94" href="#94">94</a>      <strong>public</strong> <strong>void</strong> testSameNameSiblingSQL() throws RepositoryException {
 <a name="95" href="#95">95</a>          Node n = testRootNode.addNode(<span class="string">"node"</span>, NT_UNSTRUCTURED);
-<a name="96" href="#96">96</a>          n.setProperty(<span class="string">"myvalue"</span>, <strong>new</strong> String[]{<span class="string">"foo"</span>});
+<a name="96" href="#96">96</a>          n.setProperty(<span class="string">"myvalue"</span>, <span class="string">"foo"</span>);
 <a name="97" href="#97">97</a>          n = testRootNode.addNode(<span class="string">"node"</span>, NT_UNSTRUCTURED);
-<a name="98" href="#98">98</a>          n.setProperty(<span class="string">"myvalue"</span>, <strong>new</strong> String[]{<span class="string">"bar"</span>});
+<a name="98" href="#98">98</a>          n.setProperty(<span class="string">"myvalue"</span>, <span class="string">"bar"</span>);
 <a name="99" href="#99">99</a>          n = testRootNode.addNode(<span class="string">"node"</span>, NT_UNSTRUCTURED);
-<a name="100" href="#100">100</a>         n.setProperty(<span class="string">"yourvalue"</span>, <strong>new</strong> String[]{<span class="string">"foo"</span>});
+<a name="100" href="#100">100</a>         n.setProperty(<span class="string">"yourvalue"</span>, <span class="string">"foo"</span>);
 <a name="101" href="#101">101</a> 
 <a name="102" href="#102">102</a>         testRootNode.save();
 <a name="103" href="#103">103</a> 
 <a name="104" href="#104">104</a>         String sql = <span class="string">"SELECT myvalue FROM \&quot;"</span> + NT_BASE
 <a name="105" href="#105">105</a>                 + <span class="string">"\&quot; WHERE \&quot;jcr:path\&quot; LIKE '"</span> + testRoot + <span class="string">"/node'"</span>;
-<a name="106" href="#106">106</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="106" href="#106">106</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="107" href="#107">107</a>         QueryResult result = q.execute();
 <a name="108" href="#108">108</a>         checkResult(result, 2, 2);
 <a name="109" href="#109">109</a> 

Modified: incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SimpleQueryTest.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SimpleQueryTest.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SimpleQueryTest.html (original)
+++ incubator/jackrabbit/site/xref-test/org/apache/jackrabbit/test/search/SimpleQueryTest.html Wed Feb  2 06:04:46 2005
@@ -45,7 +45,7 @@
 <a name="36" href="#36">36</a>          String sql = <span class="string">"SELECT * FROM nt:base"</span>
 <a name="37" href="#37">37</a>                  + <span class="string">" WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/foo'"</span>
 <a name="38" href="#38">38</a>                  + <span class="string">" AND bla = 'bla'"</span>;
-<a name="39" href="#39">39</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="39" href="#39">39</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="40" href="#40">40</a>          QueryResult result = q.execute();
 <a name="41" href="#41">41</a>          checkResult(result, 1);
 <a name="42" href="#42">42</a>      }
@@ -61,7 +61,7 @@
 <a name="52" href="#52">52</a>          String sql = <span class="string">"SELECT * FROM nt:file"</span> +
 <a name="53" href="#53">53</a>                  <span class="string">" WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%'"</span>
 <a name="54" href="#54">54</a>                  + <span class="string">" AND bla = 'bla'"</span>;
-<a name="55" href="#55">55</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="55" href="#55">55</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="56" href="#56">56</a>          QueryResult result = q.execute();
 <a name="57" href="#57">57</a>          checkResult(result, 0);
 <a name="58" href="#58">58</a>      }
@@ -77,7 +77,7 @@
 <a name="68" href="#68">68</a>          String sql = <span class="string">"SELECT * FROM nt:unstructured"</span> +
 <a name="69" href="#69">69</a>                  <span class="string">" WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%'"</span>
 <a name="70" href="#70">70</a>                  + <span class="string">" AND bla = 'bla'"</span>;
-<a name="71" href="#71">71</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="71" href="#71">71</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="72" href="#72">72</a>          QueryResult result = q.execute();
 <a name="73" href="#73">73</a>          checkResult(result, 2);
 <a name="74" href="#74">74</a>      }
@@ -91,7 +91,7 @@
 <a name="82" href="#82">82</a>          testRootNode.save();
 <a name="83" href="#83">83</a>  
 <a name="84" href="#84">84</a>          String sql = <span class="string">"SELECT * FROM nt:unstructured WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%'"</span>;
-<a name="85" href="#85">85</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="85" href="#85">85</a>          Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="86" href="#86">86</a>          QueryResult result = q.execute();
 <a name="87" href="#87">87</a>          checkResult(result, 2);
 <a name="88" href="#88">88</a>      }
@@ -110,12 +110,12 @@
 <a name="101" href="#101">101</a>         testRootNode.save();
 <a name="102" href="#102">102</a> 
 <a name="103" href="#103">103</a>         String sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND birth > TIMESTAMP '1976-01-01T00:00:00.000+01:00'"</span>;
-<a name="104" href="#104">104</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="104" href="#104">104</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="105" href="#105">105</a>         QueryResult result = q.execute();
 <a name="106" href="#106">106</a>         checkResult(result, 1);
 <a name="107" href="#107">107</a> 
 <a name="108" href="#108">108</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND birth > TIMESTAMP '1975-01-01T00:00:00.000+01:00'"</span>;
-<a name="109" href="#109">109</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="109" href="#109">109</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="110" href="#110">110</a>         result = q.execute();
 <a name="111" href="#111">111</a>         checkResult(result, 2);
 <a name="112" href="#112">112</a>     }
@@ -131,17 +131,17 @@
 <a name="122" href="#122">122</a>         testRootNode.save();
 <a name="123" href="#123">123</a> 
 <a name="124" href="#124">124</a>         String sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value > 0.1e-0"</span>;
-<a name="125" href="#125">125</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="125" href="#125">125</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="126" href="#126">126</a>         QueryResult result = q.execute();
 <a name="127" href="#127">127</a>         checkResult(result, 1);
 <a name="128" href="#128">128</a> 
 <a name="129" href="#129">129</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value > -0.1"</span>;
-<a name="130" href="#130">130</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="130" href="#130">130</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="131" href="#131">131</a>         result = q.execute();
 <a name="132" href="#132">132</a>         checkResult(result, 2);
 <a name="133" href="#133">133</a> 
 <a name="134" href="#134">134</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value > -1.5"</span>;
-<a name="135" href="#135">135</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="135" href="#135">135</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="136" href="#136">136</a>         result = q.execute();
 <a name="137" href="#137">137</a>         checkResult(result, 3);
 <a name="138" href="#138">138</a>     }
@@ -157,17 +157,17 @@
 <a name="148" href="#148">148</a>         testRootNode.save();
 <a name="149" href="#149">149</a> 
 <a name="150" href="#150">150</a>         String sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value > 0"</span>;
-<a name="151" href="#151">151</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="151" href="#151">151</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="152" href="#152">152</a>         QueryResult result = q.execute();
 <a name="153" href="#153">153</a>         checkResult(result, 1);
 <a name="154" href="#154">154</a> 
 <a name="155" href="#155">155</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value > -1"</span>;
-<a name="156" href="#156">156</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="156" href="#156">156</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="157" href="#157">157</a>         result = q.execute();
 <a name="158" href="#158">158</a>         checkResult(result, 2);
 <a name="159" href="#159">159</a> 
 <a name="160" href="#160">160</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value > -2"</span>;
-<a name="161" href="#161">161</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="161" href="#161">161</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="162" href="#162">162</a>         result = q.execute();
 <a name="163" href="#163">163</a>         checkResult(result, 3);
 <a name="164" href="#164">164</a>     }
@@ -183,17 +183,17 @@
 <a name="174" href="#174">174</a>         testRootNode.save();
 <a name="175" href="#175">175</a> 
 <a name="176" href="#176">176</a>         String sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'ping'"</span>;
-<a name="177" href="#177">177</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="177" href="#177">177</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="178" href="#178">178</a>         QueryResult result = q.execute();
 <a name="179" href="#179">179</a>         checkResult(result, 1);
 <a name="180" href="#180">180</a> 
 <a name="181" href="#181">181</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE '_ing'"</span>;
-<a name="182" href="#182">182</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="182" href="#182">182</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="183" href="#183">183</a>         result = q.execute();
 <a name="184" href="#184">184</a>         checkResult(result, 2);
 <a name="185" href="#185">185</a> 
 <a name="186" href="#186">186</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE '%ing'"</span>;
-<a name="187" href="#187">187</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="187" href="#187">187</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="188" href="#188">188</a>         result = q.execute();
 <a name="189" href="#189">189</a>         checkResult(result, 3);
 <a name="190" href="#190">190</a>     }
@@ -209,17 +209,17 @@
 <a name="200" href="#200">200</a>         testRootNode.save();
 <a name="201" href="#201">201</a> 
 <a name="202" href="#202">202</a>         String sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'ping'"</span>;
-<a name="203" href="#203">203</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="203" href="#203">203</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="204" href="#204">204</a>         QueryResult result = q.execute();
 <a name="205" href="#205">205</a>         checkResult(result, 1);
 <a name="206" href="#206">206</a> 
 <a name="207" href="#207">207</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'p_ng'"</span>;
-<a name="208" href="#208">208</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="208" href="#208">208</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="209" href="#209">209</a>         result = q.execute();
 <a name="210" href="#210">210</a>         checkResult(result, 2);
 <a name="211" href="#211">211</a> 
 <a name="212" href="#212">212</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'p%ng'"</span>;
-<a name="213" href="#213">213</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="213" href="#213">213</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="214" href="#214">214</a>         result = q.execute();
 <a name="215" href="#215">215</a>         checkResult(result, 3);
 <a name="216" href="#216">216</a>     }
@@ -235,17 +235,17 @@
 <a name="226" href="#226">226</a>         testRootNode.save();
 <a name="227" href="#227">227</a> 
 <a name="228" href="#228">228</a>         String sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'bli'"</span>;
-<a name="229" href="#229">229</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="229" href="#229">229</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="230" href="#230">230</a>         QueryResult result = q.execute();
 <a name="231" href="#231">231</a>         checkResult(result, 1);
 <a name="232" href="#232">232</a> 
 <a name="233" href="#233">233</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'bl_'"</span>;
-<a name="234" href="#234">234</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="234" href="#234">234</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="235" href="#235">235</a>         result = q.execute();
 <a name="236" href="#236">236</a>         checkResult(result, 2);
 <a name="237" href="#237">237</a> 
 <a name="238" href="#238">238</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'bl%'"</span>;
-<a name="239" href="#239">239</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="239" href="#239">239</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="240" href="#240">240</a>         result = q.execute();
 <a name="241" href="#241">241</a>         checkResult(result, 3);
 <a name="242" href="#242">242</a>     }
@@ -263,27 +263,27 @@
 <a name="254" href="#254">254</a>         testRootNode.save();
 <a name="255" href="#255">255</a> 
 <a name="256" href="#256">256</a>         String sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'foo&#47;&#47;_bar' ESCAPE '&#47;&#47;'"</span>; <em class="comment">// matches node3</em>
-<a name="257" href="#257">257</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="257" href="#257">257</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="258" href="#258">258</a>         QueryResult result = q.execute();
 <a name="259" href="#259">259</a>         checkResult(result, 1);
 <a name="260" href="#260">260</a> 
 <a name="261" href="#261">261</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'foo_bar'"</span>;    <em class="comment">// matches node3 and node4</em>
-<a name="262" href="#262">262</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="262" href="#262">262</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="263" href="#263">263</a>         result = q.execute();
 <a name="264" href="#264">264</a>         checkResult(result, 2);
 <a name="265" href="#265">265</a> 
 <a name="266" href="#266">266</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'foo%bar'"</span>;  <em class="comment">// matches all nodes</em>
-<a name="267" href="#267">267</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="267" href="#267">267</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="268" href="#268">268</a>         result = q.execute();
 <a name="269" href="#269">269</a>         checkResult(result, 4);
 <a name="270" href="#270">270</a> 
 <a name="271" href="#271">271</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'foo&#47;&#47;&#47;&#47;&#47;&#47;_bar' ESCAPE '&#47;&#47;'"</span>;  <em class="comment">// matches node1</em>
-<a name="272" href="#272">272</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="272" href="#272">272</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="273" href="#273">273</a>         result = q.execute();
 <a name="274" href="#274">274</a>         checkResult(result, 1);
 <a name="275" href="#275">275</a> 
 <a name="276" href="#276">276</a>         sql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value LIKE 'foo&#47;&#47;_bar'"</span>;  <em class="comment">// matches node1</em>
-<a name="277" href="#277">277</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="277" href="#277">277</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="278" href="#278">278</a>         result = q.execute();
 <a name="279" href="#279">279</a>         checkResult(result, 1);
 <a name="280" href="#280">280</a>     }
@@ -299,7 +299,7 @@
 <a name="290" href="#290">290</a>         testRootNode.save();
 <a name="291" href="#291">291</a> 
 <a name="292" href="#292">292</a>         String jcrql = <span class="string">"SELECT * FROM nt:base WHERE jcr:path LIKE '"</span> + testRoot + <span class="string">"/%' AND value &lt;> 'bar'"</span>;
-<a name="293" href="#293">293</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(jcrql, <span class="string">"sql"</span>);
+<a name="293" href="#293">293</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(jcrql, Query.SQL);
 <a name="294" href="#294">294</a>         QueryResult result = q.execute();
 <a name="295" href="#295">295</a>         checkResult(result, 2);
 <a name="296" href="#296">296</a> 
@@ -315,7 +315,7 @@
 <a name="306" href="#306">306</a> 
 <a name="307" href="#307">307</a>         String sql = <span class="string">"SELECT * FROM nt:unstructured WHERE mytext is null and jcr:path LIKE '/"</span>
 <a name="308" href="#308">308</a>                 + testRoot + <span class="string">"/%'"</span>;
-<a name="309" href="#309">309</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="309" href="#309">309</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="310" href="#310">310</a>         QueryResult result = q.execute();
 <a name="311" href="#311">311</a>         checkResult(result, 1);
 <a name="312" href="#312">312</a> 
@@ -335,7 +335,7 @@
 <a name="326" href="#326">326</a>         testRootNode.save();
 <a name="327" href="#327">327</a> 
 <a name="328" href="#328">328</a>         String sql = <span class="string">"SELECT * FROM nt:unstructured WHERE mytext is not null"</span>;
-<a name="329" href="#329">329</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="329" href="#329">329</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="330" href="#330">330</a>         QueryResult result = q.execute();
 <a name="331" href="#331">331</a>         checkResult(result, 1);
 <a name="332" href="#332">332</a> 
@@ -359,7 +359,7 @@
 <a name="350" href="#350">350</a> 
 <a name="351" href="#351">351</a>         String sql = <span class="string">"SELECT * FROM nt:unstructured WHERE 'foo' IN text "</span> +
 <a name="352" href="#352">352</a>                 <span class="string">"and jcr:path LIKE '/"</span> + testRoot + <span class="string">"/%'"</span>;
-<a name="353" href="#353">353</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="353" href="#353">353</a>         Query q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="354" href="#354">354</a>         QueryResult result = q.execute();
 <a name="355" href="#355">355</a>         checkResult(result, 3); <em class="comment">// foo, bar, bla</em>
 <a name="356" href="#356">356</a> 
@@ -370,7 +370,7 @@
 <a name="361" href="#361">361</a> 
 <a name="362" href="#362">362</a>         sql = <span class="string">"SELECT * FROM nt:unstructured WHERE text = 'foo' "</span> +
 <a name="363" href="#363">363</a>                 <span class="string">"and jcr:path LIKE '/"</span> + testRoot + <span class="string">"/%'"</span>;
-<a name="364" href="#364">364</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="364" href="#364">364</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="365" href="#365">365</a>         result = q.execute();
 <a name="366" href="#366">366</a>         checkResult(result, 2); <em class="comment">// bar, bla</em>
 <a name="367" href="#367">367</a> 
@@ -381,7 +381,7 @@
 <a name="372" href="#372">372</a> 
 <a name="373" href="#373">373</a>         sql = <span class="string">"SELECT * FROM nt:unstructured WHERE 'bar' NOT IN text "</span> +
 <a name="374" href="#374">374</a>                 <span class="string">"and jcr:path LIKE '/"</span> + testRoot + <span class="string">"/%'"</span>;
-<a name="375" href="#375">375</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, <span class="string">"sql"</span>);
+<a name="375" href="#375">375</a>         q = superuser.getWorkspace().getQueryManager().createQuery(sql, Query.SQL);
 <a name="376" href="#376">376</a>         result = q.execute();
 <a name="377" href="#377">377</a>         checkResult(result, 2); <em class="comment">// bar, bla</em>
 <a name="378" href="#378">378</a> 

Modified: incubator/jackrabbit/site/xref/allclasses-frame.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref/allclasses-frame.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref/allclasses-frame.html (original)
+++ incubator/jackrabbit/site/xref/allclasses-frame.html Wed Feb  2 06:04:46 2005
@@ -178,6 +178,10 @@
           </li>
         
           <li>
+            <a href="org/apache/jackrabbit/core/search/DefaultQueryNodeVisitor.html" target="classFrame">DefaultQueryNodeVisitor</a>
+          </li>
+        
+          <li>
             <a href="org/apache/jackrabbit/core/search/lucene/DescendantSelfAxisQuery.html" target="classFrame">DescendantSelfAxisQuery</a>
           </li>
         
@@ -735,6 +739,10 @@
         
           <li>
             <a href="org/apache/jackrabbit/core/RepositoryImpl.html" target="classFrame">RepositoryImpl</a>
+          </li>
+        
+          <li>
+            <a href="org/apache/jackrabbit/core/search/lucene/RowIteratorImpl.html" target="classFrame">RowIteratorImpl</a>
           </li>
         
           <li>

Modified: incubator/jackrabbit/site/xref/org/apache/jackrabbit/core/ItemImpl.html
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/site/xref/org/apache/jackrabbit/core/ItemImpl.html?view=diff&r1=149513&r2=149514
==============================================================================
--- incubator/jackrabbit/site/xref/org/apache/jackrabbit/core/ItemImpl.html (original)
+++ incubator/jackrabbit/site/xref/org/apache/jackrabbit/core/ItemImpl.html Wed Feb  2 06:04:46 2005
@@ -1119,8 +1119,8 @@
 <a name="1110" href="#1110">1110</a> 
 <a name="1111" href="#1111">1111</a>         <a href="../../../../org/apache/jackrabbit/core/NodeImpl.html">NodeImpl</a> parentNode = (NodeImpl) getParent();
 <a name="1112" href="#1112">1112</a> 
-<a name="1113" href="#1113">1113</a>         <em class="comment">// check if versioning allows write (only cheap call)</em>
-<a name="1114" href="#1114">1114</a>         <strong>if</strong> (!parentNode.isCheckedOut(false)) {
+<a name="1113" href="#1113">1113</a>         <em class="comment">// verify that parent node is checked-out</em>
+<a name="1114" href="#1114">1114</a>         <strong>if</strong> (!parentNode.internalIsCheckedOut()) {
 <a name="1115" href="#1115">1115</a>             String msg = parentNode.safeGetJCRPath() + <span class="string">": cannot remove a child of a checked-in node"</span>;
 <a name="1116" href="#1116">1116</a>             log.error(msg);
 <a name="1117" href="#1117">1117</a>             <strong>throw</strong> <strong>new</strong> VersionException(msg);



Mime
View raw message