Author: catholicon
Date: Tue Oct 10 08:09:07 2017
New Revision: 1811647
URL: http://svn.apache.org/viewvc?rev=1811647&view=rev
Log:
OAK-6790: FacetResult class isn't exposed anymore
Move FacetResult from o.a.j.o.spi.query.facet to o.a.j.o.query.facet
Added:
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
(contents, props changed)
- copied, changed from r1811637,
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java
(contents, props changed)
- copied, changed from r1811637,
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java
(contents, props changed)
- copied, changed from r1811637,
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java
Removed:
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
jackrabbit/oak/trunk/oak-query-spi/pom.xml
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1811647&r1=1811646&r2=1811647&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Tue Oct 10 08:09:07 2017
@@ -29,7 +29,7 @@ import java.util.List;
import org.apache.jackrabbit.core.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants;
-import org.apache.jackrabbit.oak.spi.query.facet.FacetResult;
+import org.apache.jackrabbit.oak.query.facet.FacetResult;
import org.junit.After;
import org.junit.Before;
Modified: jackrabbit/oak/trunk/oak-query-spi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-query-spi/pom.xml?rev=1811647&r1=1811646&r2=1811647&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-query-spi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-query-spi/pom.xml Tue Oct 10 08:09:07 2017
@@ -39,8 +39,8 @@
<configuration>
<instructions>
<Export-Package>
+ org.apache.jackrabbit.oak.query.facet,
org.apache.jackrabbit.oak.spi.query,
- org.apache.jackrabbit.oak.spi.query.facet,
org.apache.jackrabbit.oak.spi.query.fulltext
</Export-Package>
</instructions>
Copied:
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
(from r1811637,
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java?p2=jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java&p1=jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java&r1=1811637&r2=1811647&rev=1811647&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResult.java
(original)
+++
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
Tue Oct 10 08:09:07 2017
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.spi.query.facet;
+package org.apache.jackrabbit.oak.query.facet;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
Propchange:
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java
(from r1811637,
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java?p2=jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java&p1=jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java&r1=1811637&r2=1811647&rev=1811647&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/facet/package-info.java
(original)
+++
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java
Tue Oct 10 08:09:07 2017
@@ -15,6 +15,6 @@
* limitations under the License.
*/
@Version("1.0")
-package org.apache.jackrabbit.oak.spi.query.facet;
+package org.apache.jackrabbit.oak.query.facet;
import org.osgi.annotation.versioning.Version;
Propchange:
jackrabbit/oak/trunk/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java
(from r1811637,
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java?p2=jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java&p1=jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java&r1=1811637&r2=1811647&rev=1811647&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/facet/FacetResultTest.java
(original)
+++
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java
Tue Oct 10 08:09:07 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.spi.query.facet;
+package org.apache.jackrabbit.oak.query.facet;
import javax.jcr.Value;
import javax.jcr.query.QueryResult;
Propchange:
jackrabbit/oak/trunk/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1811647&r1=1811646&r2=1811647&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
Tue Oct 10 08:09:07 2017
@@ -28,7 +28,7 @@ import javax.jcr.query.QueryResult;
import java.util.List;
import org.apache.jackrabbit.core.query.AbstractQueryTest;
-import org.apache.jackrabbit.oak.spi.query.facet.FacetResult;
+import org.apache.jackrabbit.oak.query.facet.FacetResult;
/**
* Test for faceting capabilities via JCR API
