[jboss-svn-commits] JBL Code SVN: r33694 - in labs/jbossrules/trunk/drools-guvnor/src/main: java/org/drools/guvnor/client/modeldriven/ui and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 30 06:26:21 EDT 2010
Author: Rikkola
Date: 2010-06-30 06:26:20 -0400 (Wed, 30 Jun 2010)
New Revision: 33694
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/Guvnor.gwt.xml
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.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
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java
labs/jbossrules/trunk/drools-guvnor/src/main/webapp/WEB-INF/web.xml
Log:
faster verification. -Created VerificationService
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/Guvnor.gwt.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/Guvnor.gwt.xml 2010-06-30 10:24:57 UTC (rev 33693)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/Guvnor.gwt.xml 2010-06-30 10:26:20 UTC (rev 33694)
@@ -44,6 +44,7 @@
<servlet path="/feed" class="org.drools.guvnor.server.files.FeedServlet"/>
<servlet path="/workflowmanager" class="org.gridcc.mce.mceworkflow.servlets.WorkflowManagerServlet"/>
<servlet path="/wsdlparser" class="org.gridcc.mce.mceworkflow.servlets.WSDLParserServlet"/>
+ <servlet path="/verificationService" class="org.drools.guvnor.server.VerificationServiceImplementation"/>
<set-property name="gwt.suppressNonStaticFinalFieldWarnings" value="true" />
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java 2010-06-30 10:24:57 UTC (rev 33693)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java 2010-06-30 10:26:20 UTC (rev 33694)
@@ -43,6 +43,8 @@
import org.drools.guvnor.client.rpc.AnalysisReportLine;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.VerificationService;
+import org.drools.guvnor.client.rpc.VerificationServiceAsync;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.security.Capabilities;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
@@ -1197,7 +1199,10 @@
LoadingPopup.showMessage(constants.VerifyingItemPleaseWait());
Set<String> activeWorkingSets = WorkingSetManager.getInstance().getActiveAssetUUIDs(asset.metaData.packageName);
- RepositoryServiceFactory.getService().verifyAssetWithoutVerifiersRules(this.asset, activeWorkingSets,
+
+ VerificationServiceAsync verificationService = GWT.create( VerificationService.class );
+
+ verificationService.verifyAssetWithoutVerifiersRules(this.asset, activeWorkingSets,
new AsyncCallback<AnalysisReport>() {
public void onSuccess(AnalysisReport report) {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-06-30 10:24:57 UTC (rev 33693)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-06-30 10:26:20 UTC (rev 33694)
@@ -40,6 +40,8 @@
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.rpc.BuilderResult;
+import org.drools.guvnor.client.rpc.VerificationService;
+import org.drools.guvnor.client.rpc.VerificationServiceAsync;
import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
import org.drools.guvnor.client.modeldriven.ui.RuleModelEditor;
import org.drools.guvnor.client.modeldriven.ui.RuleModeller;
@@ -302,29 +304,32 @@
LoadingPopup.showMessage( constants.VerifyingItemPleaseWait() );
Set<String> activeWorkingSets = null;
activeWorkingSets = WorkingSetManager.getInstance().getActiveAssetUUIDs( asset.metaData.packageName );
- RepositoryServiceFactory.getService().verifyAsset( asset,
- activeWorkingSets,
- new AsyncCallback<AnalysisReport>() {
- public void onSuccess(AnalysisReport report) {
- LoadingPopup.close();
- final FormStylePopup form = new FormStylePopup( "images/rule_asset.gif",
- constants.VerificationReport() );
- ScrollPanel scrollPanel = new ScrollPanel( new VerifierResultWidget( report,
- false ) );
- scrollPanel.setWidth( "100%" );
- form.addRow( scrollPanel );
+ VerificationServiceAsync verificationService = GWT.create( VerificationService.class );
- LoadingPopup.close();
- form.show();
- }
+ verificationService.verifyAsset( asset,
+ activeWorkingSets,
+ new AsyncCallback<AnalysisReport>() {
- public void onFailure(Throwable arg0) {
- // TODO Auto-generated method stub
+ public void onSuccess(AnalysisReport report) {
+ LoadingPopup.close();
+ final FormStylePopup form = new FormStylePopup( "images/rule_asset.gif",
+ constants.VerificationReport() );
+ ScrollPanel scrollPanel = new ScrollPanel( new VerifierResultWidget( report,
+ false ) );
+ scrollPanel.setWidth( "100%" );
+ form.addRow( scrollPanel );
- }
- } );
+ LoadingPopup.close();
+ form.show();
+ }
+ public void onFailure(Throwable arg0) {
+ // TODO Auto-generated method stub
+
+ }
+ } );
+
}
private void doValidate() {
@@ -429,7 +434,8 @@
}
protected void showWorkingSetsSelection(RuleModeller modeller) {
- new WorkingSetSelectorPopup( modeller, asset ).show();
+ new WorkingSetSelectorPopup( modeller,
+ asset ).show();
}
public static interface CheckinAction {
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-06-30 10:24:57 UTC (rev 33693)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-06-30 10:26:20 UTC (rev 33694)
@@ -345,15 +345,6 @@
public org.drools.guvnor.client.rpc.SnapshotDiffs compareSnapshots(java.lang.String p0, java.lang.String p1, java.lang.String p2) {
return getService().compareSnapshots( p0, p1, p2);
}
-
- public AnalysisReport verifyAsset(RuleAsset asset, Set<String> activeWorkingSets) throws SerializationException {
- return getService().verifyAsset( asset, activeWorkingSets );
- }
-
- public AnalysisReport verifyAssetWithoutVerifiersRules(RuleAsset asset, Set<String> activeWorkingSets) throws SerializationException{
- return getService().verifyAssetWithoutVerifiersRules(asset, activeWorkingSets);
- }
-
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-06-30 10:24:57 UTC (rev 33693)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-06-30 10:26:20 UTC (rev 33694)
@@ -634,7 +634,7 @@
return loadRuleAssets( Arrays.asList( uuids ) );
}
- private RuleAsset[] loadRuleAssets(Collection<String> uuids) throws SerializationException {
+ RuleAsset[] loadRuleAssets(Collection<String> uuids) throws SerializationException {
if ( uuids == null ) {
return null;
}
@@ -2902,71 +2902,4 @@
diffs.diffs = list.toArray( new SnapshotDiff[list.size()] );
return diffs;
}
-
- @WebRemote
- @Restrict("#{identity.loggedIn}")
- public AnalysisReport verifyAsset(RuleAsset asset,
- Set<String> activeWorkingSets) throws SerializationException {
- return this.performAssetVerification( asset,
- true,
- activeWorkingSets );
- }
-
- @WebRemote
- @Restrict("#{identity.loggedIn}")
- public AnalysisReport verifyAssetWithoutVerifiersRules(RuleAsset asset,
- Set<String> activeWorkingSets) throws SerializationException {
- return this.performAssetVerification( asset,
- false,
- activeWorkingSets );
- }
-
- private AnalysisReport performAssetVerification(RuleAsset asset,
- boolean useVerifierDefaultConfig,
- Set<String> activeWorkingSets) throws SerializationException {
- long startTime = System.currentTimeMillis();
-
- if ( Contexts.isSessionContextActive() ) {
- Identity.instance().checkPermission( new PackageNameType( asset.metaData.packageName ),
- RoleTypes.PACKAGE_DEVELOPER );
- }
-
- String drl = "package " + asset.metaData.packageName + "\n" + getDroolsHeader( repository.loadPackage( asset.metaData.packageName ) ) + "\n" + this.buildAssetSource( asset );
-
- VerifierRunner runner = new VerifierRunner();
-
- runner.setUseDefaultConfig( useVerifierDefaultConfig );
-
- RuleAsset[] workingSets = loadRuleAssets( activeWorkingSets );
- List<String> constraintRules = new LinkedList<String>();
- if ( workingSets != null ) {
- for ( RuleAsset ws : workingSets ) {
- WorkingSetConfigData wsConfig = (WorkingSetConfigData) ws.content;
- if ( wsConfig.constraints != null ) {
- for ( ConstraintConfiguration config : wsConfig.constraints ) {
- constraintRules.add( ConstraintsFactory.getInstance().getVerifierRule( config ) );
- }
- }
- }
- }
- log.debug( "constraints rules: " + constraintRules );
- try {
- AnalysisReport report;
- if ( AssetFormats.DECISION_TABLE_GUIDED.equals( asset.metaData.format ) || AssetFormats.DECISION_SPREADSHEET_XLS.equals( asset.metaData.format ) ) {
- report = runner.verify( drl,
- VerifierConfiguration.VERIFYING_SCOPE_DECISION_TABLE,
- constraintRules );
- } else {
- report = runner.verify( drl,
- VerifierConfiguration.VERIFYING_SCOPE_SINGLE_RULE,
- constraintRules );
- }
-
- log.debug( "Asset verification took: "+ (System.currentTimeMillis()-startTime) );
-
- return report;
- } catch (Throwable t){
- throw new SerializationException( t.getMessage() );
- }
- }
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java 2010-06-30 10:24:57 UTC (rev 33693)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java 2010-06-30 10:26:20 UTC (rev 33694)
@@ -66,9 +66,8 @@
ResourceType.DRL );
addToRulesVerifier();
+ fireAnalysis();
- this.fireAnalysis();
-
VerifierReport report = verifier.getResult();
return VerifierReportCreator.doReport( report );
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/webapp/WEB-INF/web.xml 2010-06-30 10:24:57 UTC (rev 33693)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/webapp/WEB-INF/web.xml 2010-06-30 10:26:20 UTC (rev 33694)
@@ -1,116 +1,120 @@
-<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>JBoss Drools Guvnor</display-name>
-
- <filter>
- <filter-name>Seam Filter</filter-name>
- <filter-class>org.jboss.seam.web.ContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>Seam Filter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <listener>
- <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
- </listener>
-
- <!-- servlets - mostly to do with file management -->
- <servlet>
- <servlet-name>guvnorService</servlet-name>
- <servlet-class>org.drools.guvnor.server.RepositoryServiceServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>securityService</servlet-name>
- <servlet-class>org.drools.guvnor.server.SecurityServiceServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>AssetFileServlet</servlet-name>
- <servlet-class>org.drools.guvnor.server.files.AssetFileServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>PackageDeploymentServlet</servlet-name>
- <servlet-class>org.drools.guvnor.server.files.PackageDeploymentServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>RepositoryBackupServlet</servlet-name>
- <servlet-class>org.drools.guvnor.server.files.RepositoryBackupServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>WebdavServlet</servlet-name>
- <servlet-class>org.drools.guvnor.server.files.WebdavServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>RestAPIServlet</servlet-name>
- <servlet-class> org.drools.guvnor.server.files.RestAPIServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>FeedServlet</servlet-name>
- <servlet-class> org.drools.guvnor.server.files.FeedServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>WorkflowManagerServlet</servlet-name>
- <servlet-class> org.gridcc.mce.mceworkflow.servlets.WorkflowManagerServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>WSDLParserServlet</servlet-name>
- <servlet-class> org.gridcc.mce.mceworkflow.servlets.WSDLParserServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>guvnorAPI</servlet-name>
- <servlet-class>org.drools.guvnor.server.GuvnorAPIServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>guvnorService</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/guvnorService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>securityService</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/securityService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AssetFileServlet</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/asset</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>PackageDeploymentServlet</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/package/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>RepositoryBackupServlet</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/backup</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>WebdavServlet</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/webdav/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>RestAPIServlet</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/api/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>FeedServlet</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/feed/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>WorkflowManagerServlet</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/workflowmanager/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>WSDLParserServlet</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/wsdlparser/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>guvnorAPI</servlet-name>
- <url-pattern>/org.drools.guvnor.Guvnor/guvnorAPI</url-pattern>
- </servlet-mapping>
-
- <session-config>
- <session-timeout>180</session-timeout>
- </session-config>
-
-
-</web-app>
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <display-name>JBoss Drools Guvnor</display-name>
+ <filter>
+ <filter-name>Seam Filter</filter-name>
+ <filter-class>org.jboss.seam.web.ContextFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>Seam Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <listener>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ </listener>
+ <!-- servlets - mostly to do with file management -->
+ <servlet>
+ <servlet-name>guvnorService</servlet-name>
+ <servlet-class>org.drools.guvnor.server.RepositoryServiceServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>securityService</servlet-name>
+ <servlet-class>org.drools.guvnor.server.SecurityServiceServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>AssetFileServlet</servlet-name>
+ <servlet-class>org.drools.guvnor.server.files.AssetFileServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>PackageDeploymentServlet</servlet-name>
+ <servlet-class>org.drools.guvnor.server.files.PackageDeploymentServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>RepositoryBackupServlet</servlet-name>
+ <servlet-class>org.drools.guvnor.server.files.RepositoryBackupServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>WebdavServlet</servlet-name>
+ <servlet-class>org.drools.guvnor.server.files.WebdavServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>RestAPIServlet</servlet-name>
+ <servlet-class>org.drools.guvnor.server.files.RestAPIServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>FeedServlet</servlet-name>
+ <servlet-class>org.drools.guvnor.server.files.FeedServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>WorkflowManagerServlet</servlet-name>
+ <servlet-class>org.gridcc.mce.mceworkflow.servlets.WorkflowManagerServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>WSDLParserServlet</servlet-name>
+ <servlet-class>org.gridcc.mce.mceworkflow.servlets.WSDLParserServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>guvnorAPI</servlet-name>
+ <servlet-class>org.drools.guvnor.server.GuvnorAPIServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>verificationService</servlet-name>
+ <servlet-class>org.drools.guvnor.server.VerificationServiceImplementation</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>guvnorService</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/guvnorService</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>securityService</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/securityService</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AssetFileServlet</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/asset</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>PackageDeploymentServlet</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/package/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>RepositoryBackupServlet</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/backup</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>WebdavServlet</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/webdav/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>RestAPIServlet</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/api/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>FeedServlet</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/feed/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>WorkflowManagerServlet</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/workflowmanager/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>WSDLParserServlet</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/wsdlparser/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>guvnorAPI</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/guvnorAPI</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>verificationService</servlet-name>
+ <url-pattern>/org.drools.guvnor.Guvnor/verificationService</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>180</session-timeout>
+ </session-config>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
More information about the jboss-svn-commits
mailing list