You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2014/10/14 16:46:25 UTC
[1/3] git commit: CXF-5923: Create sample to demonstrate usage of
search extension with Lucene and Tika. Added OR/AND search criteria support.
Repository: cxf
Updated Branches:
refs/heads/master 0cfedc9a8 -> 92502a5e2
CXF-5923: Create sample to demonstrate usage of search extension with Lucene and Tika. Added OR/AND search criteria support.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4fe78449
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4fe78449
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4fe78449
Branch: refs/heads/master
Commit: 4fe7844935f9b4ad797760613d143949f9448905
Parents: 42934a1
Author: reta <dr...@gmail.com>
Authored: Tue Oct 14 10:39:01 2014 -0400
Committer: reta <dr...@gmail.com>
Committed: Tue Oct 14 10:39:01 2014 -0400
----------------------------------------------------------------------
.../src/main/resources/browser/index.html | 43 ++++++++++++++++++--
1 file changed, 39 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4fe78449/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html b/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
index dc1c2d7..2505e83 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
@@ -33,6 +33,15 @@
<button type="submit" class="btn btn-default"><i class="glyphicon glyphicon-search"></i></button>
</div>
</div>
+
+ <div class="btn-group" data-toggle="buttons">
+ <label class="btn btn-primary active">
+ <input type="radio" name="options" id="any" />Any keyword (OR)
+ </label>
+ <label class="btn btn-primary">
+ <input type="radio" name="options" id="all" />All keywords (AND)
+ </label>
+ </div>
</form>
<div class="fluent-container" id="results">
@@ -40,6 +49,8 @@
</div> <!-- /container -->
<script type="text/javascript">
+ $( "#any" ).prop( "checked", true );
+
function handleError(request, status, error, form) {
$( "#error-message" ).removeClass('hide');
@@ -81,14 +92,38 @@
});
$( "#form-search" ).submit(function(e) {
- var query = $( "#search-query" ).val();
+ var query = $( "#search-query" ).val().trim();
$( "#error-message" ).addClass('hide');
$( "#results" ).html("");
if( query !== "" ) {
- var encodedQuery = encodeURIComponent( query );
- var encodedWildcardsQuery = encodeURIComponent( "*" + query + "*" );
- var filter = "ct==" + encodedQuery + ",source==" + encodedWildcardsQuery;
+ var contentQuery = "";
+ var wildcardsQuery = "";
+
+ if( $( "#all" ).is( ":checked" ) ) {
+ contentQuery += "(";
+ wildcardsQuery += ",(";
+
+ query.split( " " ).forEach( function( entry ) {
+ if( contentQuery.length > 1 ) contentQuery += ";";
+ if( wildcardsQuery.length > 2 ) wildcardsQuery += ";";
+
+ contentQuery += "ct==" + encodeURIComponent( entry );
+ wildcardsQuery += "source==" + encodeURIComponent( "*" + entry + "*" );
+ } );
+
+ contentQuery += ")";
+ wildcardsQuery += ")";
+ } else {
+ contentQuery = "ct==" + encodeURIComponent( query );
+
+ query.split( " " ).forEach( function( entry ) {
+ wildcardsQuery += ",source==" + encodeURIComponent( "*" + entry + "*" );
+ } );
+ }
+
+ var encodedWildcardsQuery = encodeURIComponent( wildcardsQuery.trim() );
+ var filter = contentQuery + wildcardsQuery;
$.ajax({
url: $(this).attr("action") + "?$filter=" + filter,
[3/3] git commit: CXF-5923: Create sample to demonstrate usage of
search extension with Lucene and Tika. Added OR/AND search criteria support.
Posted by re...@apache.org.
CXF-5923: Create sample to demonstrate usage of search extension with Lucene and Tika. Added OR/AND search criteria support.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/92502a5e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/92502a5e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/92502a5e
Branch: refs/heads/master
Commit: 92502a5e2af6e5d3c544f89396de2d05d539fd41
Parents: 3ade4ba
Author: reta <dr...@gmail.com>
Authored: Tue Oct 14 10:45:23 2014 -0400
Committer: reta <dr...@gmail.com>
Committed: Tue Oct 14 10:45:23 2014 -0400
----------------------------------------------------------------------
.../samples/jax_rs/search/src/main/resources/browser/index.html | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/92502a5e/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html b/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
index 2505e83..6caff3a 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
@@ -102,18 +102,13 @@
if( $( "#all" ).is( ":checked" ) ) {
contentQuery += "(";
- wildcardsQuery += ",(";
query.split( " " ).forEach( function( entry ) {
if( contentQuery.length > 1 ) contentQuery += ";";
- if( wildcardsQuery.length > 2 ) wildcardsQuery += ";";
-
contentQuery += "ct==" + encodeURIComponent( entry );
- wildcardsQuery += "source==" + encodeURIComponent( "*" + entry + "*" );
} );
contentQuery += ")";
- wildcardsQuery += ")";
} else {
contentQuery = "ct==" + encodeURIComponent( query );
[2/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by re...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3ade4ba5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3ade4ba5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3ade4ba5
Branch: refs/heads/master
Commit: 3ade4ba504de84a355eb7ae53c3fd32f9e54e75c
Parents: 4fe7844 0cfedc9
Author: reta <dr...@gmail.com>
Authored: Tue Oct 14 10:39:05 2014 -0400
Committer: reta <dr...@gmail.com>
Committed: Tue Oct 14 10:39:05 2014 -0400
----------------------------------------------------------------------
.../provider/json/AbstractJsonMapObject.java | 61 +++++
.../json/JsonMapObjectReaderWriter.java | 219 ++++++++++++++++++
rt/rs/security/jose/pom.xml | 5 +
.../rs/security/jose/AbstractJoseObject.java | 61 -----
.../jose/AbstractJoseObjectReaderWriter.java | 230 -------------------
.../cxf/rs/security/jose/JoseHeaders.java | 3 +-
.../security/jose/JoseHeadersReaderWriter.java | 6 +-
.../jose/jwk/DefaultJwkReaderWriter.java | 9 +-
.../cxf/rs/security/jose/jwk/JsonWebKey.java | 4 +-
.../cxf/rs/security/jose/jwk/JsonWebKeys.java | 4 +-
.../cxf/rs/security/jose/jwt/JwtClaims.java | 4 +-
.../security/jose/jwt/JwtTokenReaderWriter.java | 20 +-
.../wss4j/UsernameTokenInterceptor.java | 7 +
.../apache/cxf/systest/ws/ut/DoubleItUt.wsdl | 2 +
14 files changed, 329 insertions(+), 306 deletions(-)
----------------------------------------------------------------------