[jboss-svn-commits] JBL Code SVN: r36253 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor: server and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 8 05:02:14 EST 2010
Author: ge0ffrey
Date: 2010-12-08 05:02:14 -0500 (Wed, 08 Dec 2010)
New Revision: 36253
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
Log:
method order: move the methods used by QueryWidget together
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2010-12-08 09:52:37 UTC (rev 36252)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2010-12-08 10:02:14 UTC (rev 36253)
@@ -325,14 +325,6 @@
String newSnapshotName) throws SerializationException;
/**
- * This will quickly return a list of assets
- */
- public TableDataResult quickFindAsset(String searchText,
- boolean searchArchived,
- int skip,
- int numRows) throws SerializationException;
-
- /**
* This will remove a category. A category must have no
* current assets linked to it, or else it will not be able to be removed.
* @param categoryPath The full path to the category. Any sub categories will also
@@ -504,6 +496,14 @@
String expression);
/**
+ * This will quickly return a list of assets
+ */
+ public TableDataResult quickFindAsset(String searchText,
+ boolean searchArchived,
+ int skip,
+ int numRows) throws SerializationException;
+
+ /**
* Runs a full text search using JCR.
* @param text
* @param seekArchived
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2010-12-08 09:52:37 UTC (rev 36252)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2010-12-08 10:02:14 UTC (rev 36253)
@@ -86,9 +86,9 @@
void loadTableConfig(java.lang.String listName, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableConfig> arg2);
void lockAsset(java.lang.String uuid, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg2);
void promoteAssetToGlobalArea(java.lang.String assetUUID, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg2);
- void queryFullText(java.lang.String text, boolean seekArchived, int skip, int numRows, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg5);
- void queryMetaData(org.drools.guvnor.client.rpc.MetaDataQuery[] qr, java.util.Date createdAfter, java.util.Date createdBefore, java.util.Date modifiedAfter, java.util.Date modifiedBefore, boolean seekArchived, int skip, int numRows, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg9);
- void quickFindAsset(java.lang.String searchText, boolean searchArchived, int skip, int numRows, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg5);
+ void quickFindAsset(java.lang.String searchText, boolean searchArchived, int skip, int numRows, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg5);
+ void queryFullText(java.lang.String text, boolean seekArchived, int skip, int numRows, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg5);
+ void queryMetaData(org.drools.guvnor.client.rpc.MetaDataQuery[] qr, java.util.Date createdAfter, java.util.Date createdBefore, java.util.Date modifiedAfter, java.util.Date modifiedBefore, boolean seekArchived, int skip, int numRows, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg9);
void rebuildPackages(com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg1);
void rebuildSnapshots(com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg1);
void removeAsset(java.lang.String uuid, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg2);
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-12-08 09:52:37 UTC (rev 36252)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-12-08 10:02:14 UTC (rev 36253)
@@ -233,9 +233,6 @@
public void copyOrRemoveSnapshot(java.lang.String p0, java.lang.String p1, boolean p2, java.lang.String p3) throws SerializationException {
getService().copyOrRemoveSnapshot( p0, p1, p2, p3);
}
- public org.drools.guvnor.client.rpc.TableDataResult quickFindAsset(java.lang.String p0, boolean p1, int p2, int p3) throws SerializationException {
- return getService().quickFindAsset( p0, p1, p2, p3);
- }
public void removeCategory(java.lang.String p0) throws SerializationException {
getService().removeCategory( p0);
}
@@ -316,6 +313,9 @@
public java.lang.String[] loadDropDownExpression(java.lang.String[] p0, java.lang.String p1) {
return getService().loadDropDownExpression( p0, p1);
}
+ public org.drools.guvnor.client.rpc.TableDataResult quickFindAsset(java.lang.String p0, boolean p1, int p2, int p3) throws SerializationException {
+ return getService().quickFindAsset( p0, p1, p2, p3);
+ }
public org.drools.guvnor.client.rpc.TableDataResult queryFullText(java.lang.String p0, boolean p1, int p2, int p3) throws SerializationException {
return getService().queryFullText( p0, p1, p2, p3);
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-12-08 09:52:37 UTC (rev 36252)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-12-08 10:02:14 UTC (rev 36253)
@@ -1166,6 +1166,43 @@
@WebRemote
@Restrict("#{identity.loggedIn}")
+ public TableDataResult quickFindAsset(String searchText,
+ boolean searchArchived,
+ int skip,
+ int numRows) throws SerializationException {
+ String search = searchText.replace( '*',
+ '%' );
+
+ if ( !search.endsWith( "%" ) ) {
+ search += "%";
+ }
+
+ List<AssetItem> resultList = new ArrayList<AssetItem>();
+
+ long start = System.currentTimeMillis();
+ AssetItemIterator it = repository.findAssetsByName( search,
+ searchArchived ); // search for archived items
+ log.debug( "Search time: " + (System.currentTimeMillis() - start) );
+
+ // Add filter for READONLY permission
+ RepositoryFilter filter = new AssetItemFilter();
+
+ while ( it.hasNext() ) {
+ AssetItem ai = it.next();
+ if ( filter.accept( ai,
+ RoleTypes.PACKAGE_READONLY ) ) {
+ resultList.add( ai );
+ }
+ }
+
+ TableDisplayHandler handler = new TableDisplayHandler( "searchresults" );
+ return handler.loadRuleListTable( resultList,
+ skip,
+ numRows );
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
public TableDataResult queryFullText(String text,
boolean seekArchived,
int skip,
@@ -1545,45 +1582,6 @@
@WebRemote
@Restrict("#{identity.loggedIn}")
- public TableDataResult quickFindAsset(String searchText,
- boolean searchArchived,
- int skip,
- int numRows) throws SerializationException {
- String search = searchText.replace( '*',
- '%' );
-
- if ( !search.endsWith( "%" ) ) {
- search += "%";
- }
-
- List<AssetItem> resultList = new ArrayList<AssetItem>();
-
- long start = System.currentTimeMillis();
- AssetItemIterator it = repository.findAssetsByName( search,
- searchArchived ); // search for archived items
- log.debug( "Search time: " + (System.currentTimeMillis() - start) );
-
- // Add filter for READONLY permission
- RepositoryFilter filter = new AssetItemFilter();
-
- while ( it.hasNext() ) {
- AssetItem ai = it.next();
- if ( filter.accept( ai,
- RoleTypes.PACKAGE_READONLY ) ) {
- resultList.add( ai );
- }
- }
-
- TableDisplayHandler handler = new TableDisplayHandler( "searchresults" );
-
- return handler.loadRuleListTable( resultList,
- skip,
- numRows );
-
- }
-
- @WebRemote
- @Restrict("#{identity.loggedIn}")
public void removeCategory(String categoryPath) throws SerializationException {
log.info( "USER:" + getCurrentUserName() + " REMOVING CATEGORY path: [" + categoryPath + "]" );
More information about the jboss-svn-commits
mailing list