You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/12/10 14:27:14 UTC

svn commit: r1419438 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/ConditionType.java

Author: sergeyb
Date: Mon Dec 10 13:27:13 2012
New Revision: 1419438

URL: http://svn.apache.org/viewvc?rev=1419438&view=rev
Log:
Merged revisions 1419434 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1419434 | sergeyb | 2012-12-10 13:22:56 +0000 (Mon, 10 Dec 2012) | 1 line
  
  Restoring CUSTOM search type
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/ConditionType.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1419434

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/ConditionType.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/ConditionType.java?rev=1419438&r1=1419437&r2=1419438&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/ConditionType.java (original)
+++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/ConditionType.java Mon Dec 10 13:27:13 2012
@@ -31,5 +31,6 @@ public enum ConditionType {
     LESS_OR_EQUALS,
     GREATER_OR_EQUALS,
     OR,
-    AND
+    AND,
+    CUSTOM
 }