Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 44657DF6A for ; Tue, 19 Jun 2012 09:42:24 +0000 (UTC) Received: (qmail 75356 invoked by uid 500); 19 Jun 2012 09:42:24 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 75234 invoked by uid 500); 19 Jun 2012 09:42:23 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 75224 invoked by uid 99); 19 Jun 2012 09:42:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2012 09:42:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2012 09:42:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 89ADC2388E91; Tue, 19 Jun 2012 09:41:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1351621 - in /cxf/branches/2.6.x-fixes: ./ rt/management-web/src/test/java/org/apache/cxf/management/web/logging/ rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/ rt/rs/extensions/search/src/main/java/org/apache/cxf/j... Date: Tue, 19 Jun 2012 09:41:57 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120619094157.89ADC2388E91@eris.apache.org> Author: sergeyb Date: Tue Jun 19 09:41:56 2012 New Revision: 1351621 URL: http://svn.apache.org/viewvc?rev=1351621&view=rev Log: Merged revisions 1351617 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1351617 | sergeyb | 2012-06-19 10:37:41 +0100 (Tue, 19 Jun 2012) | 1 line [CXF-4389] Moving FiqlParser to its own package ........ Added: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchConditionParser.java - copied unchanged from r1351617, cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchConditionParser.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchParseException.java - copied unchanged from r1351617, cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchParseException.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/ - copied from r1351617, cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java - copied unchanged from r1351617, cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/ - copied from r1351617, cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java - copied unchanged from r1351617, cxf/trunk/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java Removed: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/FiqlParseException.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/FiqlParser.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/FiqlParserTest.java Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/management-web/src/test/java/org/apache/cxf/management/web/logging/ReadOnlyFileStorageTest.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilder.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorTest.java cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1351617 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Tue Jun 19 09:41:56 2012 @@ -1 +1 @@ -/cxf/trunk:1-1348209,1348845,1348862,1348866,1349016,1349264,1349307,1349406,1349549,1349714-1349717,1349723,1349825,1350114,1350141,1350186,1350215-1350303,1350305,1350318,1350582,1350617,1350633,1350739,1351410,1351418,1351586 +/cxf/trunk:1-1348209,1348845,1348862,1348866,1349016,1349264,1349307,1349406,1349549,1349714-1349717,1349723,1349825,1350114,1350141,1350186,1350215-1350303,1350305,1350318,1350582,1350617,1350633,1350739,1351410,1351418,1351586,1351617 Modified: cxf/branches/2.6.x-fixes/rt/management-web/src/test/java/org/apache/cxf/management/web/logging/ReadOnlyFileStorageTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/management-web/src/test/java/org/apache/cxf/management/web/logging/ReadOnlyFileStorageTest.java?rev=1351621&r1=1351620&r2=1351621&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/management-web/src/test/java/org/apache/cxf/management/web/logging/ReadOnlyFileStorageTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/management-web/src/test/java/org/apache/cxf/management/web/logging/ReadOnlyFileStorageTest.java Tue Jun 19 09:41:56 2012 @@ -24,10 +24,10 @@ import java.util.List; import java.util.Map; import org.apache.cxf.jaxrs.ext.search.ConditionType; -import org.apache.cxf.jaxrs.ext.search.FiqlParser; import org.apache.cxf.jaxrs.ext.search.PrimitiveSearchCondition; import org.apache.cxf.jaxrs.ext.search.SearchCondition; import org.apache.cxf.jaxrs.ext.search.SearchUtils; +import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser; import org.junit.After; import org.junit.Assert; Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java?rev=1351621&r1=1351620&r2=1351621&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java Tue Jun 19 09:41:56 2012 @@ -30,7 +30,7 @@ import java.util.Set; /** * Bean introspection utility. */ -class Beanspector { +public class Beanspector { private Class tclass; private T tobj; Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java?rev=1351621&r1=1351620&r2=1351621&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java Tue Jun 19 09:41:56 2012 @@ -26,6 +26,7 @@ import java.util.logging.Logger; import javax.ws.rs.core.MultivaluedMap; import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser; import org.apache.cxf.jaxrs.utils.InjectionUtils; import org.apache.cxf.jaxrs.utils.JAXRSUtils; import org.apache.cxf.message.Message; @@ -49,13 +50,13 @@ public class SearchContextImpl implement throw new IllegalArgumentException(errorMessage); } - FiqlParser parser = getParser(cls); + SearchConditionParser parser = getParser(cls); String expression = getSearchExpression(); if (expression != null) { try { return parser.parse(expression); - } catch (FiqlParseException ex) { + } catch (SearchParseException ex) { return null; } } else { Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilder.java?rev=1351621&r1=1351620&r2=1351621&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilder.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilder.java Tue Jun 19 09:41:56 2012 @@ -25,8 +25,8 @@ import java.util.Map; import javax.xml.datatype.Duration; -import org.apache.cxf.jaxrs.ext.search.FiqlParser; import org.apache.cxf.jaxrs.ext.search.SearchUtils; +import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser; /** * Builds a FIQL search condition. Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java?rev=1351621&r1=1351620&r2=1351621&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java Tue Jun 19 09:41:56 2012 @@ -28,7 +28,7 @@ import org.junit.Test; public class BeanspectorTest extends Assert { @Test - public void testSimpleBean() throws FiqlParseException { + public void testSimpleBean() throws SearchParseException { Beanspector bean = new Beanspector(new SimpleBean()); Set getters = bean.getGettersNames(); assertEquals(3, getters.size()); @@ -42,7 +42,7 @@ public class BeanspectorTest extends Ass } @Test(expected = IllegalArgumentException.class) - public void testMismatchedAccessorTypes() throws FiqlParseException { + public void testMismatchedAccessorTypes() throws SearchParseException { new Beanspector(MismatchedTypes.class); } Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java?rev=1351621&r1=1351620&r2=1351621&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPALanguageVisitorTest.java Tue Jun 19 09:41:56 2012 @@ -18,8 +18,8 @@ */ package org.apache.cxf.jaxrs.ext.search.jpa; -import org.apache.cxf.jaxrs.ext.search.FiqlParser; import org.apache.cxf.jaxrs.ext.search.SearchCondition; +import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser; import org.junit.Assert; import org.junit.Test; Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorTest.java?rev=1351621&r1=1351620&r2=1351621&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorTest.java Tue Jun 19 09:41:56 2012 @@ -27,8 +27,8 @@ import javax.persistence.EntityManagerFa import javax.persistence.Persistence; import javax.persistence.TypedQuery; -import org.apache.cxf.jaxrs.ext.search.FiqlParser; import org.apache.cxf.jaxrs.ext.search.SearchCondition; +import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser; import org.junit.After; import org.junit.Assert; Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java?rev=1351621&r1=1351620&r2=1351621&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java Tue Jun 19 09:41:56 2012 @@ -21,10 +21,10 @@ package org.apache.cxf.jaxrs.ext.search. import java.util.Collections; import java.util.Date; -import org.apache.cxf.jaxrs.ext.search.FiqlParseException; -import org.apache.cxf.jaxrs.ext.search.FiqlParser; import org.apache.cxf.jaxrs.ext.search.SearchBean; import org.apache.cxf.jaxrs.ext.search.SearchCondition; +import org.apache.cxf.jaxrs.ext.search.SearchParseException; +import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser; import org.junit.Assert; import org.junit.Ignore; @@ -35,7 +35,7 @@ public class SQLPrinterVisitorTest exten private FiqlParser parser = new FiqlParser(Condition.class); @Test - public void testSQL1() throws FiqlParseException { + public void testSQL1() throws SearchParseException { SearchCondition filter = parser.parse("name==ami*;level=gt=10"); SQLPrinterVisitor visitor = new SQLPrinterVisitor("table"); filter.accept(visitor); @@ -46,7 +46,7 @@ public class SQLPrinterVisitorTest exten } @Test - public void testSQL1WithSearchBean() throws FiqlParseException { + public void testSQL1WithSearchBean() throws SearchParseException { FiqlParser beanParser = new FiqlParser(SearchBean.class); SearchCondition filter = beanParser.parse("name==ami*;level=gt=10"); SQLPrinterVisitor visitor = new SQLPrinterVisitor("table"); @@ -58,7 +58,7 @@ public class SQLPrinterVisitorTest exten } @Test - public void testSQL2() throws FiqlParseException { + public void testSQL2() throws SearchParseException { SearchCondition filter = parser.parse("name==ami*,level=gt=10"); SQLPrinterVisitor visitor = new SQLPrinterVisitor("table"); filter.accept(visitor); @@ -68,7 +68,7 @@ public class SQLPrinterVisitorTest exten } @Test - public void testSQL3() throws FiqlParseException { + public void testSQL3() throws SearchParseException { SearchCondition filter = parser.parse("name==foo*;(name!=*bar,level=gt=10)"); SQLPrinterVisitor visitor = new SQLPrinterVisitor("table"); filter.accept(visitor); @@ -80,7 +80,7 @@ public class SQLPrinterVisitorTest exten } @Test - public void testSQL3WithSearchBean() throws FiqlParseException { + public void testSQL3WithSearchBean() throws SearchParseException { FiqlParser beanParser = new FiqlParser(SearchBean.class); SearchCondition filter = beanParser.parse("name==foo*;(name!=*bar,level=gt=10)"); SQLPrinterVisitor visitor = new SQLPrinterVisitor("table"); @@ -93,7 +93,7 @@ public class SQLPrinterVisitorTest exten } @Test - public void testSQL4() throws FiqlParseException { + public void testSQL4() throws SearchParseException { SearchCondition filter = parser.parse("(name==test,level==18);(name==test1,level!=19)"); SQLPrinterVisitor visitor = new SQLPrinterVisitor("table"); filter.accept(visitor); @@ -105,7 +105,7 @@ public class SQLPrinterVisitorTest exten } @Test - public void testSQL5() throws FiqlParseException { + public void testSQL5() throws SearchParseException { SearchCondition filter = parser.parse("name==test"); SQLPrinterVisitor visitor = new SQLPrinterVisitor("table"); filter.accept(visitor); @@ -114,7 +114,7 @@ public class SQLPrinterVisitorTest exten } @Test - public void testSQL5WithColumns() throws FiqlParseException { + public void testSQL5WithColumns() throws SearchParseException { SearchCondition filter = parser.parse("name==test"); SQLPrinterVisitor visitor = new SQLPrinterVisitor("table", "NAMES"); @@ -124,7 +124,7 @@ public class SQLPrinterVisitorTest exten } @Test - public void testSQL5WithFieldMap() throws FiqlParseException { + public void testSQL5WithFieldMap() throws SearchParseException { SearchCondition filter = parser.parse("name==test"); SQLPrinterVisitor visitor = new SQLPrinterVisitor(