[jboss-svn-commits] JBL Code SVN: r20604 - in labs/jbossrules/trunk: drools-compiler/src/main/java/org/drools/brms and 74 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 18 21:48:28 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-06-18 21:48:27 -0400 (Wed, 18 Jun 2008)
New Revision: 20604
Added:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/DropDownData.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngine.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/package.html
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/converter/
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/package.html
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ActionFieldValueTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ActionSetFieldTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/CompositeFactPatternTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/CompositeFieldConstraintTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ConstraintTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DSLSentenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/FactPatternTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/RuleModelTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/SampleDataSource.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/SampleDataSource2.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/dt/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/package.html
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/converter/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/JBRMS.gwt.xml
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/JBRMSEntryPoint.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoggedInUserInfo.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoginWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionInsertColumn.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionSetColumn.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/DecisionTableXLSWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/model/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/HumanReadable.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/brl/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/package.html
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/package.html
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/table/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/
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/builder/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/package.html
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/AsyncInterfaceTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/HumanReadableTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/package.html
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/ui/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rulelist/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/rules/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/
Removed:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/client/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/JBRMS.gwt.xml
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/gwtutil/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/public/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionFieldList.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionFieldValue.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionInsertFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionInsertLogicalFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionRetractFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionSetField.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionUpdateField.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CompositeFactPattern.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CompositeFieldConstraint.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ConnectiveConstraint.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/DSLSentence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/FactPattern.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/FieldConstraint.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/IAction.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/IPattern.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ISingleFieldConstraint.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/PortableObject.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleAttribute.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleModel.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/SingleFieldConstraint.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionCol.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionInsertFactCol.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionRetractFactCol.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionSetFieldCol.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/AttributeCol.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ConditionCol.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/DTColumnConfig.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/GuidedDecisionTable.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/ExecutionTrace.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/Expectation.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/FactData.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/FieldData.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/Fixture.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/RetractFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/Scenario.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/VerifyFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/VerifyField.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/VerifyRuleFired.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/ClassWalker.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRXMLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/GuidedDTDRLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/GuidedDTXMLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ScenarioXMLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/SuggestionCompletionEngineBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/Alert.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/dt/GuidedDecisionTableTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SomeFact.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRDRLPersistenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRLPersitenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/GuidedDTDRLPersistenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/GuidedDTXMLPersistenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ScenarioXMLPersistenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/SuggestionCompletionEngineBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactDataTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioTest.java
labs/jbossrules/trunk/drools-guvnor/.classpath
labs/jbossrules/trunk/drools-guvnor/.project
labs/jbossrules/trunk/drools-guvnor/build.xml
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/BackupManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/LogViewer.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/StateManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryExplorerWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategorySelectHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/AssetFormats.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/CompletionItemsAsync.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/CompletionItemsAsyncReturn.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DefaultContentUploadEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableComposite.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableContainer.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableHorizontalPane.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableVerticalPane.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ErrorPopup.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FieldEditListener.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStyleLayout.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStylePopup.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/HTMLFileManagerFields.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/IDirtyable.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ImageButton.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/InfoPopup.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/LoadingPopup.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/PrettyFormLayout.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/RulePackageSelector.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/SmallLabel.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/Snapshot.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/StatusChangePopup.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ValidationMessageWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ValueChanged.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackageHierarchy.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/brl/PortableObject.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionRetractFactWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionValueEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java
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/packages/AssetAttachmentFileWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/FactTemplateWizard.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/ModelAttachmentFileWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageNameValidator.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisResultWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisView.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioHelper.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioPackageView.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisFactUsage.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisFieldUsage.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisReport.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisReportLine.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/BuilderResult.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/BulkTestRunResult.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/DetailedSerializableException.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/LogEntry.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/MetaData.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/PackageConfigData.java
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/client/rpc/RepositoryServiceFactory.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RuleAsset.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RuleContentText.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ScenarioResultSummary.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ScenarioRunResult.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SecurityService.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SecurityServiceAsync.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SessionExpiredException.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SnapshotInfo.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableConfig.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableDataResult.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableDataRow.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/UserSecurityContext.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ValidatedResponse.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/client/ruleeditor/AssetCategoryEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ChoiceList.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DSLRuleEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ListUtil.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleDocumentWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowUploadWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleValidatorWrapper.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/SaveEventListener.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGridDataLoader.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/EditItemEvent.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/RuleListItem.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/RuleListViewLegacy.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/table/DataModel.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/table/RowData.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/AsyncInterfaceGenerator.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentAssemblyError.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLDefinitionContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DecisionTableXLSHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DefaultContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/EnumerationContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FunctionContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/IRuleAsset.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/IValidating.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PlainTextContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ScenarioContentHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AssetFileServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentURIHelper.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryBackupServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/WebDAVImpl.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/WebdavServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/BRMSRepositoryConfiguration.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RulesRepositoryManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/Allow.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/AssetSelector.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/FormData.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/MetaDataMapper.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/RowLoader.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TableDisplayHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/remoting/gwt/GWTToSeamAdapter.java
labs/jbossrules/trunk/drools-guvnor/src/main/resources/contenthandler.properties
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditorTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/ScenarioHelperTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rulelist/TableDataRowTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/DeploymentURIHelperTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPResponse.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/WebDAVImplTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/BRMSRepositoryConfigurationTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepo.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepositoryConfigurator.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/rules/BRMSSuggestionCompletionLoaderTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/DummyClass.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/GWTNoSeamTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/IO.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TestBean.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/remoting/gwt/GWTToSeamAdapterTest.java
Log:
-renamed project from jbrms to guvnor
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/DropDownData.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/DropDownData.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/DropDownData.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/DropDownData.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,48 @@
+package org.drools.guvnor.client.modeldriven;
+
+/**
+ * Used to drive drop downs.
+ * @author Michael Neale
+ *
+ */
+public class DropDownData {
+
+ /**
+ * If this is non null, just show these items.
+ */
+ public String[] fixedList = null;
+
+ /**
+ * this would be something that takes the name/value pairs and interpolates them into an MVEL expression
+ * that resolves to a list.
+ */
+ public String queryExpression = null;
+
+ /**
+ * Something like as list of:
+ * sex=M, name=Michael etc....
+ */
+ public String[] valuePairs = null;
+
+ public static DropDownData create(String[] list) {
+ if (list == null) return null;
+ return new DropDownData(list);
+ }
+
+ public static DropDownData create(String queryExpression, String[] valuePairs) {
+ if (queryExpression == null) return null;
+ return new DropDownData(queryExpression, valuePairs);
+ }
+
+ private DropDownData(String[] list) {
+ this.fixedList = list;
+ }
+
+ private DropDownData(String queryExpression, String[] valuePairs) {
+ this.queryExpression = queryExpression;
+ this.valuePairs = valuePairs;
+ }
+
+
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngine.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngine.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngine.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,392 @@
+package org.drools.guvnor.client.modeldriven;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.FieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.PortableObject;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+
+/**
+ * An suggestion completion processor. This should be usable in both GWT/Web and the IDE.
+ * The data for this can be loaded into this from simple string lists.
+ *
+ * @author Michael Neale
+ */
+public class SuggestionCompletionEngine
+ implements
+ PortableObject {
+
+ /** These are the explicit types supported */
+ public static final String TYPE_COLLECTION = "Collection";
+ public static final String TYPE_COMPARABLE = "Comparable";
+ public static final String TYPE_STRING = "String";
+ public static final String TYPE_NUMERIC = "Numeric";
+ public static final String TYPE_BOOLEAN = "Boolean";
+ //public static final String TYPE_DATE = "Date";
+ public static final String TYPE_OBJECT = "Object"; //for all other unknown types
+
+ /**
+ * The operators that are used at different times (based on type).
+ */
+ private static final String[] STANDARD_CONNECTIVES = new String[]{"|| ==", "|| !=", "&& !="};
+ private static final String[] STRING_CONNECTIVES = new String[]{"|| ==", "|| !=", "&& !=", "&& matches", "|| matches"};
+ private static final String[] COMPARABLE_CONNECTIVES = new String[]{"|| ==", "|| !=", "&& !=", "&& >", "&& <", "|| >", "|| <", "&& >=", "&& <=", "|| <=", "|| >="};
+ private static final String[] COLLECTION_CONNECTIVES = new String[]{"|| ==", "|| !=", "&& !=", "|| contains", "&& contains", "|| excludes", "&& excludes"};
+
+ private static final String[] STANDARD_OPERATORS = new String[]{"==", "!="};
+ private static final String[] COMPARABLE_OPERATORS = new String[]{"==", "!=", "<", ">", "<=", ">="};
+ private static final String[] STRING_OPERATORS = new String[]{"==", "!=", "matches", "soundslike"};
+ private static final String[] COLLECTION_OPERATORS = new String[]{"contains", "excludes", "==", "!="};
+
+ /** The top level conditional elements (first order logic) */
+ private static final String[] CONDITIONAL_ELEMENTS = new String[]{"not", "exists", "or"};
+
+ /**
+ * A list of fact types (never fully qualified).
+ */
+ public String[] factTypes;
+
+ /**
+ * A map of types to the fields. key is type, value is (String[] of fields)
+ *
+ * @gwt.typeArgs <java.lang.String, java.lang.String[]>
+ */
+ public Map fieldsForType;
+
+ /**
+ * A map of the Fields to their types, needed for operator completions,
+ * as well as other things like rendering strings, dates etc.
+ * This is in the format of: { 'Type.field' => 'typename' }.
+ * Should not be the exact type, perhaps just a high level interface, eg "Comparable".
+ *
+ * @gwt.typeArgs <java.lang.String, java.lang.String>
+ */
+ public Map fieldTypes;
+
+ /**
+ * Contains a map of globals (name is key) and their type (value).
+ * @gwt.typeArgs <java.lang.String, java.lang.String>
+ */
+ public Map globalTypes = new HashMap();
+
+ /**
+ * Contains a map of { TypeName.field : String[] } - where a list is
+ * valid values to display in a drop down for a given Type.field combination.
+ * @gwt.typeArgs <java.lang.String, java.lang.String[]>
+ */
+ public Map dataEnumLists = new HashMap();
+
+ /** Operators (from the grammar):
+ * op=( '=='
+ | '>'
+ | '>='
+ | '<'
+ | '<='
+ | '!='
+ | 'contains'
+ | 'matches'
+ | 'excludes'
+ )
+ * Connectives add "&" and "|" to this.
+ */
+
+ /**
+ * DSL language extensions, if needed, if provided by the package.
+ */
+ public DSLSentence[] conditionDSLSentences = new DSLSentence[0];
+ public DSLSentence[] actionDSLSentences = new DSLSentence[0];
+
+
+
+ /**
+ * This is used to calculate what fields an enum list may depend on. Optional.
+ */
+ private transient Map dataEnumLookupFields;
+
+ // /**
+ // * For bulk loading up the data (from a previous rule save)
+ // *
+ // * @param factToFields A map of "FactType" (key - String) to String[] (value)
+ // * @param factFieldToOperator A map of "FactType.field" (key - String) to String[] operators
+ // * @param factFieldToConnectiveOperator A map of "FactType.field" (key -String) to String[] operators
+ // * that are valid CONNECTIVE operators.
+ // *
+ // * @param globals A map of global variable name to its fields (String[]).
+ // * @param boundFacts A map of bound facts to types.
+ // * @param conditionDSLs a list of DSLSentence suggestions for the LHS
+ // * @param actionDSLs a list of DSLSentence suggestions for the RHS
+ // *
+ // */
+ // public void load(
+ // Map factToFields,
+ // Map factFieldToOperator,
+ // Map factFieldToConnectiveOperator,
+ // Map globals,
+ // List conditionDSLs,
+ // List actionDSLs
+ // ) {
+ // this.factToFields = factToFields;
+ // this.factFieldToOperator = factFieldToOperator;
+ // this.factFieldToConnectiveOperator = factFieldToConnectiveOperator;
+ // this.actionDSLSentences = actionDSLs;
+ // this.conditionDSLSentences = conditionDSLs;
+ // this.globals = globals;
+ //
+ // }
+
+ public SuggestionCompletionEngine() {
+
+ }
+
+ public String[] getConditionalElements() {
+ return CONDITIONAL_ELEMENTS;
+ }
+
+ public DSLSentence[] getDSLConditions() {
+ return this.conditionDSLSentences;
+ }
+
+ public DSLSentence[] getDSLActions() {
+ return this.actionDSLSentences;
+ }
+
+ public String[] getConnectiveOperatorCompletions(final String factType,
+ final String fieldName) {
+ final String type = (String) this.fieldTypes.get( factType + "." + fieldName );
+ if ( type == null ) {
+ return STANDARD_CONNECTIVES;
+ } else if ( type.equals( TYPE_STRING ) ) {
+ return STRING_CONNECTIVES;
+ } else if ( type.equals( TYPE_COMPARABLE ) || type.equals( TYPE_NUMERIC ) ) {
+ return COMPARABLE_CONNECTIVES;
+ } else if ( type.equals( TYPE_COLLECTION ) ) {
+ return COLLECTION_CONNECTIVES;
+ } else {
+ return STANDARD_CONNECTIVES;
+ }
+
+ }
+
+ public String[] getFactTypes() {
+ return this.factTypes;
+ }
+
+ public String[] getFieldCompletions(final String factType) {
+ return (String[]) this.fieldsForType.get( factType );
+
+ }
+
+ public String[] getOperatorCompletions(final String factType,
+ final String fieldName) {
+ final String type = (String) this.fieldTypes.get( factType + "." + fieldName );
+ if ( type == null ) {
+ return STANDARD_OPERATORS;
+ } else if ( type.equals( TYPE_STRING ) ) {
+ return STRING_OPERATORS;
+ } else if ( type.equals( TYPE_COMPARABLE ) || type.equals( TYPE_NUMERIC ) ) {
+ return COMPARABLE_OPERATORS;
+ } else if ( type.equals( TYPE_COLLECTION ) ) {
+ return COLLECTION_OPERATORS;
+ } else {
+ return STANDARD_OPERATORS;
+ }
+
+ }
+
+
+ /**
+ * A map of the Fields to their types, needed for operator completions,
+ * as well as other things like rendering strings, dates etc.
+ * This is in the format of: { 'Type.field' => 'typename' }.
+ * Should not be the exact type, perhaps just a high level interface, eg "Comparable", "Numeric", "String".
+ *
+ */
+ public String getFieldType(final String factType,
+ final String fieldName) {
+ return (String) this.fieldTypes.get( factType + "." + fieldName );
+ }
+
+ public boolean isGlobalVariable(final String variable) {
+ return this.globalTypes.containsKey( variable );
+ }
+
+ public String[] getFieldCompletionsForGlobalVariable(final String varName) {
+ final String type = (String) this.globalTypes.get( varName );
+ return (String[]) this.fieldsForType.get( type );
+ }
+
+ private String[] toStringArray(final Set set) {
+ final String[] f = new String[set.size()];
+ int i = 0;
+ for ( final Iterator iter = set.iterator(); iter.hasNext(); ) {
+ f[i] = (String) iter.next();
+ i++;
+ }
+ return f;
+ }
+
+ public String[] getGlobalVariables() {
+ return toStringArray( this.globalTypes.keySet() );
+ }
+
+ /**
+ * This returns a list of enums options (values) that can be used
+ * for the given field of the given FactPattern.
+ *
+ * This also takes into account enums that depend on other fields.
+ *
+ */
+ public DropDownData getEnums(FactPattern pat, String field) {
+
+ Map dataEnumLookupFields = loadDataEnumLookupFields();
+
+ if (pat.constraintList != null && pat.constraintList.constraints != null) {
+ //we may need to check for data dependent enums
+ Object _typeField = dataEnumLookupFields.get(pat.factType + "." + field );
+ if (_typeField instanceof String) {
+ String typeField = (String) _typeField;
+ FieldConstraint[] cons = pat.constraintList.constraints;
+ for (int i = 0; i < cons.length; i++) {
+ FieldConstraint con = cons[i];
+ if (con instanceof SingleFieldConstraint) {
+ SingleFieldConstraint sfc = (SingleFieldConstraint) con;
+ if ( sfc.fieldName.equals(typeField)) {
+ String key = pat.factType + "." + field + "[" + typeField + "=" + sfc.value + "]";
+ return DropDownData.create((String[]) this.dataEnumLists.get(key));
+ }
+ }
+ }
+ } else if (_typeField != null ){
+ //these enums are calculated on demand, server side...
+ String[] fieldsNeeded = (String[]) _typeField;
+ String queryString = getQueryString(pat.factType, field, this.dataEnumLists);
+
+ String[] valuePairs = new String[fieldsNeeded.length];
+
+ //collect all the values of the fields needed, then return it as a string...
+ for (int i = 0; i < fieldsNeeded.length; i++) {
+ for (int j = 0; j < pat.constraintList.constraints.length; j++) {
+ FieldConstraint con = pat.constraintList.constraints[j];
+ if (con instanceof SingleFieldConstraint) {
+ SingleFieldConstraint sfc = (SingleFieldConstraint) con;
+ if (sfc.fieldName.equals(fieldsNeeded[i])) {
+ valuePairs[i] = fieldsNeeded[i] + "=" + sfc.value;
+ }
+ }
+ }
+ }
+ return DropDownData.create(queryString, valuePairs);
+ }
+ }
+ return DropDownData.create(getEnumValues(pat.factType, field));
+ }
+
+
+
+
+
+
+ /**
+ * Similar to the one above - but this one is for RHS.
+ */
+ public DropDownData getEnums(String type, ActionFieldValue[] currentValues, String field) {
+
+ if (currentValues != null) {
+ Map dataEnumLookupFields = loadDataEnumLookupFields();
+ Object _typeField = dataEnumLookupFields.get(type + "." + field );
+
+ if (_typeField instanceof String) {
+ String typeField = (String) dataEnumLookupFields.get(type + "." + field );
+ for (int i = 0; i < currentValues.length; i++) {
+ ActionFieldValue val = currentValues[i];
+ if (val.field.equals(typeField)) {
+ String key = type + "." + field + "[" + typeField + "=" + val.value + "]";
+ return DropDownData.create((String[]) this.dataEnumLists.get(key));
+ }
+ }
+ } else if (_typeField != null) {
+ String[] fieldsNeeded = (String[]) _typeField;
+ String queryString = getQueryString(type, field, this.dataEnumLists);
+ String[] valuePairs = new String[fieldsNeeded.length];
+
+ //collect all the values of the fields needed, then return it as a string...
+ for (int i = 0; i < fieldsNeeded.length; i++) {
+ for (int j = 0; j < currentValues.length; j++) {
+ ActionFieldValue con = currentValues[j];
+ if (con.field.equals(fieldsNeeded[i])) {
+ valuePairs[i] = fieldsNeeded[i] + "=" + con.value;
+ }
+ }
+ }
+ return DropDownData.create(queryString, valuePairs);
+
+ }
+ }
+
+ String[] vals = (String[]) this.dataEnumLists.get(type + "." + field);
+ return DropDownData.create(vals);
+
+
+ }
+
+ /**
+ * Get the query string for a fact.field
+ * It will ignore any specified field, and just look for the string - as there should only be
+ * one Fact.field of this type (it is all determined server side).
+ */
+ String getQueryString(String factType, String field,
+ Map dataEnumLists) {
+ for (Iterator iterator = dataEnumLists.keySet().iterator(); iterator.hasNext();) {
+ String key = (String) iterator.next();
+ if (key.startsWith(factType + "." + field)) {
+ return (String) dataEnumLists.get(key);
+ }
+ }
+ throw new IllegalStateException();
+ }
+
+
+ /**
+ * For simple cases - where a list of values are known based on a field.
+ */
+ public String[] getEnumValues(String factType, String field) {
+ return (String[]) this.dataEnumLists.get(factType + "." + field);
+ }
+
+
+ /**
+ * This is only used by enums that are like Fact.field[something=X] and so on.
+ */
+ Map loadDataEnumLookupFields() {
+ if (this.dataEnumLookupFields == null) {
+ this.dataEnumLookupFields = new HashMap();
+ Set keys = this.dataEnumLists.keySet();
+ for (Iterator iter = keys.iterator(); iter.hasNext();) {
+ String key = (String) iter.next();
+ if (key.indexOf('[') != -1) {
+ int ix = key.indexOf('[');
+ String factField = key.substring(0, ix);
+ String predicate = key.substring(ix + 1, key.indexOf(']'));
+ if (predicate.indexOf('=') > -1) {
+ String typeField = predicate.substring(0, predicate.indexOf('='));
+ dataEnumLookupFields.put(factField, typeField);
+ } else {
+ String[] fields = predicate.split(",");
+ for (int i = 0; i < fields.length; i++) {fields[i] = fields[i].trim();}
+ dataEnumLookupFields.put(factField, fields);
+ }
+ }
+ }
+ }
+
+
+ return dataEnumLookupFields;
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl)
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionFieldList.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldList.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionFieldList.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
* This class is the parent for field setting or assertion actions.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionFieldValue.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldValue.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionFieldValue.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionInsertFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertFact.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionInsertFact.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionInsertLogicalFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertLogicalFact.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionInsertLogicalFact.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
* Logical assertions are used as part of "truth maintenance".
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionRetractFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionRetractFact.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionRetractFact.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionSetField.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionSetField.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionSetField.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionUpdateField.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionUpdateField.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ActionUpdateField.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
* Basically the same as setting fields, EXCEPT that
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CompositeFactPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFactPattern.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CompositeFactPattern.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CompositeFieldConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFieldConstraint.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/CompositeFieldConstraint.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ConnectiveConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ConnectiveConstraint.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ConnectiveConstraint.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
* This is for a connective constraint that adds more options to a field constraint.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/DSLSentence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/DSLSentence.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/DSLSentence.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/FactPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FactPattern.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/FactPattern.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/FieldConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FieldConstraint.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/FieldConstraint.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
* This is the top level interface for all field constraints.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/IAction.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/IAction.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/IAction.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
public interface IAction
extends
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/IPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/IPattern.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/IPattern.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
public interface IPattern
extends
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ISingleFieldConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ISingleFieldConstraint.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ISingleFieldConstraint.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/PortableObject.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/PortableObject.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/PortableObject.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
import java.io.Serializable;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleAttribute.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleAttribute.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleModel.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleModel.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleModel.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
import java.util.ArrayList;
import java.util.List;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/SingleFieldConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/SingleFieldConstraint.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/SingleFieldConstraint.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/**
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt)
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionCol.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionCol.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionCol.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.dt;
+package org.drools.guvnor.client.modeldriven.dt;
public class ActionCol extends DTColumnConfig {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionInsertFactCol.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionInsertFactCol.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionInsertFactCol.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.dt;
+package org.drools.guvnor.client.modeldriven.dt;
public class ActionInsertFactCol extends ActionCol {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionRetractFactCol.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionRetractFactCol.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionRetractFactCol.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.dt;
+package org.drools.guvnor.client.modeldriven.dt;
public class ActionRetractFactCol extends ActionCol {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionSetFieldCol.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionSetFieldCol.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ActionSetFieldCol.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.dt;
+package org.drools.guvnor.client.modeldriven.dt;
public class ActionSetFieldCol extends ActionCol {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/AttributeCol.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/AttributeCol.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/AttributeCol.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.dt;
+package org.drools.guvnor.client.modeldriven.dt;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ConditionCol.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ConditionCol.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/ConditionCol.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.dt;
+package org.drools.guvnor.client.modeldriven.dt;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/DTColumnConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/DTColumnConfig.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/DTColumnConfig.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,6 +1,6 @@
-package org.drools.brms.client.modeldriven.dt;
+package org.drools.guvnor.client.modeldriven.dt;
-import org.drools.brms.client.modeldriven.brl.PortableObject;
+import org.drools.guvnor.client.modeldriven.brl.PortableObject;
public class DTColumnConfig implements PortableObject {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/GuidedDecisionTable.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/GuidedDecisionTable.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/GuidedDecisionTable.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,12 +1,12 @@
-package org.drools.brms.client.modeldriven.dt;
+package org.drools.guvnor.client.modeldriven.dt;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.PortableObject;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.PortableObject;
/**
* This is a decision table model for a guided editor. It is not template or XLS based.
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing)
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/ExecutionTrace.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ExecutionTrace.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/ExecutionTrace.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.testing;
+package org.drools.guvnor.client.modeldriven.testing;
import java.util.Date;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/Expectation.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Expectation.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/Expectation.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.testing;
+package org.drools.guvnor.client.modeldriven.testing;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/FactData.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/FactData.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/FactData.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.testing;
+package org.drools.guvnor.client.modeldriven.testing;
import java.util.ArrayList;
import java.util.List;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/FieldData.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/FieldData.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/FieldData.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,6 +1,6 @@
-package org.drools.brms.client.modeldriven.testing;
+package org.drools.guvnor.client.modeldriven.testing;
-import org.drools.brms.client.modeldriven.brl.PortableObject;
+import org.drools.guvnor.client.modeldriven.brl.PortableObject;
public class FieldData implements PortableObject {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/Fixture.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Fixture.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/Fixture.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,6 +1,6 @@
-package org.drools.brms.client.modeldriven.testing;
+package org.drools.guvnor.client.modeldriven.testing;
-import org.drools.brms.client.modeldriven.brl.PortableObject;
+import org.drools.guvnor.client.modeldriven.brl.PortableObject;
/**
* All test fixtures implement this.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/RetractFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/RetractFact.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/RetractFact.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.testing;
+package org.drools.guvnor.client.modeldriven.testing;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/Scenario.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Scenario.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/Scenario.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.testing;
+package org.drools.guvnor.client.modeldriven.testing;
import java.util.ArrayList;
import java.util.Date;
@@ -7,7 +7,7 @@
import java.util.List;
import java.util.Map;
-import org.drools.brms.client.modeldriven.brl.PortableObject;
+import org.drools.guvnor.client.modeldriven.brl.PortableObject;
/**
* This represents a test scenario.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/VerifyFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyFact.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/VerifyFact.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.testing;
+package org.drools.guvnor.client.modeldriven.testing;
import java.util.ArrayList;
import java.util.List;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/VerifyField.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyField.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/VerifyField.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,6 +1,6 @@
-package org.drools.brms.client.modeldriven.testing;
+package org.drools.guvnor.client.modeldriven.testing;
-import org.drools.brms.client.modeldriven.brl.PortableObject;
+import org.drools.guvnor.client.modeldriven.brl.PortableObject;
public class VerifyField implements PortableObject {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/VerifyRuleFired.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyRuleFired.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/testing/VerifyRuleFired.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.testing;
+package org.drools.guvnor.client.modeldriven.testing;
public class VerifyRuleFired implements Expectation {
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/package.html (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/package.html)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/package.html (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/package.html 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,5 @@
+<body>
+This package and subpackages are for items pertinent to the BRMS, that are kept in this module for re-usability.
+Items in this package and subpackage must be compilable via GWT to Javascript, which means a subset of java.
+Generally, you won't need to look in this package.
+</body>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/converter (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/converter)
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/package.html (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/package.html)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/package.html (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/package.html 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,3 @@
+<body>
+ This package has some server utilities that are used by the BRMS and IDE.
+</body>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules)
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/ClassWalker.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules/ClassWalker.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/ClassWalker.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.rules;
+package org.drools.guvnor.server.rules;
/*
* Copyright 2007 Mark Derricutt
*
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.rules;
+package org.drools.guvnor.server.rules;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -15,12 +15,12 @@
import java.util.jar.JarInputStream;
import org.drools.base.ClassTypeResolver;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.server.util.DataEnumLoader;
-import org.drools.brms.server.util.SuggestionCompletionEngineBuilder;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.ParserError;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.server.util.DataEnumLoader;
+import org.drools.guvnor.server.util.SuggestionCompletionEngineBuilder;
import org.drools.lang.descr.FactTemplateDescr;
import org.drools.lang.descr.FieldTemplateDescr;
import org.drools.lang.descr.GlobalDescr;
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util)
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,24 +1,24 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brl.ActionInsertLogicalFact;
-import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brl.ActionSetField;
-import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.FieldConstraint;
-import org.drools.brms.client.modeldriven.brl.IAction;
-import org.drools.brms.client.modeldriven.brl.IPattern;
-import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.RuleAttribute;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertLogicalFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionRetractFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
+import org.drools.guvnor.client.modeldriven.brl.ActionUpdateField;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.FieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.IAction;
+import org.drools.guvnor.client.modeldriven.brl.IPattern;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
import org.drools.util.ReflectiveVisitor;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRLPersistence.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRLPersistence.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,6 +1,6 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
public interface BRLPersistence {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRXMLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRXMLPersistence.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRXMLPersistence.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,19 +1,19 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
-import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brl.ActionInsertLogicalFact;
-import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brl.ActionSetField;
-import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.RuleAttribute;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertLogicalFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionRetractFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
+import org.drools.guvnor.client.modeldriven.brl.ActionUpdateField;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/DataEnumLoader.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import java.util.ArrayList;
import java.util.Collections;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/GuidedDTDRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/GuidedDTDRLPersistence.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,26 +1,26 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import java.util.ArrayList;
import java.util.List;
-import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brl.ActionSetField;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.IAction;
-import org.drools.brms.client.modeldriven.brl.IPattern;
-import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.RuleAttribute;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
-import org.drools.brms.client.modeldriven.dt.ActionCol;
-import org.drools.brms.client.modeldriven.dt.ActionInsertFactCol;
-import org.drools.brms.client.modeldriven.dt.ActionRetractFactCol;
-import org.drools.brms.client.modeldriven.dt.ActionSetFieldCol;
-import org.drools.brms.client.modeldriven.dt.AttributeCol;
-import org.drools.brms.client.modeldriven.dt.ConditionCol;
-import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionRetractFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.IAction;
+import org.drools.guvnor.client.modeldriven.brl.IPattern;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.dt.ActionCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionInsertFactCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionRetractFactCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.guvnor.client.modeldriven.dt.AttributeCol;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
/**
* This takes care of converting GuidedDT object to DRL (via the RuleModel).
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/GuidedDTXMLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTXMLPersistence.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/GuidedDTXMLPersistence.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,11 +1,11 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
-import org.drools.brms.client.modeldriven.dt.ActionInsertFactCol;
-import org.drools.brms.client.modeldriven.dt.ActionRetractFactCol;
-import org.drools.brms.client.modeldriven.dt.ActionSetFieldCol;
-import org.drools.brms.client.modeldriven.dt.AttributeCol;
-import org.drools.brms.client.modeldriven.dt.ConditionCol;
-import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.client.modeldriven.dt.ActionInsertFactCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionRetractFactCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.guvnor.client.modeldriven.dt.AttributeCol;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ScenarioXMLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/ScenarioXMLPersistence.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ScenarioXMLPersistence.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,15 +1,15 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
-import org.drools.brms.client.modeldriven.testing.ExecutionTrace;
-import org.drools.brms.client.modeldriven.testing.Expectation;
-import org.drools.brms.client.modeldriven.testing.FactData;
-import org.drools.brms.client.modeldriven.testing.FieldData;
-import org.drools.brms.client.modeldriven.testing.Fixture;
-import org.drools.brms.client.modeldriven.testing.RetractFact;
-import org.drools.brms.client.modeldriven.testing.Scenario;
-import org.drools.brms.client.modeldriven.testing.VerifyFact;
-import org.drools.brms.client.modeldriven.testing.VerifyField;
-import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
+import org.drools.guvnor.client.modeldriven.testing.Expectation;
+import org.drools.guvnor.client.modeldriven.testing.FactData;
+import org.drools.guvnor.client.modeldriven.testing.FieldData;
+import org.drools.guvnor.client.modeldriven.testing.Fixture;
+import org.drools.guvnor.client.modeldriven.testing.RetractFact;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyField;
+import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/SuggestionCompletionEngineBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilder.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/SuggestionCompletionEngineBuilder.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
/**
* A builder to incrementally populate a SuggestionCompletionEngine
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -11,17 +11,17 @@
import org.drools.FactHandle;
import org.drools.base.TypeResolver;
-import org.drools.brms.client.modeldriven.testing.ExecutionTrace;
-import org.drools.brms.client.modeldriven.testing.Expectation;
-import org.drools.brms.client.modeldriven.testing.FactData;
-import org.drools.brms.client.modeldriven.testing.FieldData;
-import org.drools.brms.client.modeldriven.testing.Fixture;
-import org.drools.brms.client.modeldriven.testing.RetractFact;
-import org.drools.brms.client.modeldriven.testing.Scenario;
-import org.drools.brms.client.modeldriven.testing.VerifyFact;
-import org.drools.brms.client.modeldriven.testing.VerifyField;
-import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
import org.drools.common.InternalWorkingMemory;
+import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
+import org.drools.guvnor.client.modeldriven.testing.Expectation;
+import org.drools.guvnor.client.modeldriven.testing.FactData;
+import org.drools.guvnor.client.modeldriven.testing.FieldData;
+import org.drools.guvnor.client.modeldriven.testing.Fixture;
+import org.drools.guvnor.client.modeldriven.testing.RetractFact;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyField;
+import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
import org.drools.rule.TimeMachine;
/**
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/client/modeldriven)
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/Alert.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/client/modeldriven/Alert.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/Alert.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven;
+package org.drools.guvnor.client.modeldriven;
public class Alert {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngineTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven;
+package org.drools.guvnor.client.modeldriven;
import java.util.ArrayList;
import java.util.HashMap;
@@ -7,10 +7,12 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
-import org.drools.brms.server.rules.SuggestionCompletionLoader;
+import org.drools.guvnor.client.modeldriven.DropDownData;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.server.rules.SuggestionCompletionLoader;
public class SuggestionCompletionEngineTest extends TestCase {
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ActionFieldValueTest.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ActionFieldValueTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ActionFieldValueTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,21 @@
+package org.drools.guvnor.modeldriven;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+
+public class ActionFieldValueTest extends TestCase {
+
+ public void testFormula() {
+ ActionFieldValue val = new ActionFieldValue( "x",
+ "y",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
+ assertFalse( val.isFormula() );
+ val = new ActionFieldValue( "x",
+ "=y * 20",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
+ assertTrue( val.isFormula() );
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ActionSetFieldTest.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ActionSetFieldTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ActionSetFieldTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,58 @@
+package org.drools.guvnor.modeldriven;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
+
+public class ActionSetFieldTest extends TestCase {
+
+ public void testRemove() {
+ final ActionSetField set = new ActionSetField();
+ set.fieldValues = new ActionFieldValue[2];
+ final ActionFieldValue v0 = new ActionFieldValue( "x",
+ "42",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
+ final ActionFieldValue v1 = new ActionFieldValue( "y",
+ "43",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
+ set.fieldValues[0] = v0;
+ set.fieldValues[1] = v1;
+
+ set.removeField( 1 );
+
+ assertEquals( 1,
+ set.fieldValues.length );
+ assertEquals( v0,
+ set.fieldValues[0] );
+
+ }
+
+ public void testAdd() {
+ final ActionSetField set = new ActionSetField();
+ set.fieldValues = new ActionFieldValue[2];
+ final ActionFieldValue v0 = new ActionFieldValue( "x",
+ "42",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
+ final ActionFieldValue v1 = new ActionFieldValue( "y",
+ "43",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
+ set.fieldValues[0] = v0;
+ set.fieldValues[1] = v1;
+
+ final ActionFieldValue q = new ActionFieldValue( "q",
+ "q",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
+ set.addFieldValue( q );
+
+ assertEquals( 3,
+ set.fieldValues.length );
+ assertEquals( q,
+ set.fieldValues[2] );
+ assertEquals( v0,
+ set.fieldValues[0] );
+
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/CompositeFactPatternTest.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFactPatternTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/CompositeFactPatternTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/CompositeFactPatternTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,27 @@
+package org.drools.guvnor.modeldriven;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+
+public class CompositeFactPatternTest extends TestCase {
+
+ public void testAddPattern() {
+ final CompositeFactPattern pat = new CompositeFactPattern();
+ final FactPattern x = new FactPattern();
+ pat.addFactPattern( x );
+ assertEquals( 1,
+ pat.patterns.length );
+
+ final FactPattern y = new FactPattern();
+ pat.addFactPattern( y );
+ assertEquals( 2,
+ pat.patterns.length );
+ assertEquals( x,
+ pat.patterns[0] );
+ assertEquals( y,
+ pat.patterns[1] );
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/CompositeFieldConstraintTest.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFieldConstraintTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/CompositeFieldConstraintTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/CompositeFieldConstraintTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,59 @@
+package org.drools.guvnor.modeldriven;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+
+public class CompositeFieldConstraintTest extends TestCase {
+
+ public void testCompositeType() {
+ CompositeFieldConstraint con = new CompositeFieldConstraint();
+ assertEquals(null, con.compositeJunctionType);
+ }
+
+ public void testAddConstraint() {
+ final CompositeFieldConstraint p = new CompositeFieldConstraint();
+ final SingleFieldConstraint x = new SingleFieldConstraint( "x" );
+ p.addConstraint( x );
+
+ assertEquals( 1,
+ p.constraints.length );
+ assertEquals( x,
+ p.constraints[0] );
+
+ final SingleFieldConstraint y = new SingleFieldConstraint( "y" );
+
+ p.addConstraint( y );
+ assertEquals( 2,
+ p.constraints.length );
+ assertEquals( x,
+ p.constraints[0] );
+ assertEquals( y,
+ p.constraints[1] );
+
+ }
+
+ public void testRemoveConstraint() {
+ final CompositeFieldConstraint p = new CompositeFieldConstraint();
+ final SingleFieldConstraint x = new SingleFieldConstraint( "x" );
+ p.addConstraint( x );
+ final CompositeFieldConstraint y = new CompositeFieldConstraint( );
+ p.addConstraint( y );
+
+ assertEquals( 2,
+ p.constraints.length );
+
+ p.removeConstraint( 1 );
+
+ assertEquals( 1,
+ p.constraints.length );
+
+ assertEquals( x,
+ p.constraints[0] );
+
+ }
+
+
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ConstraintTest.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConstraintTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ConstraintTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/ConstraintTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,25 @@
+package org.drools.guvnor.modeldriven;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+
+public class ConstraintTest extends TestCase {
+
+ public void testAdd() {
+ final SingleFieldConstraint con = new SingleFieldConstraint();
+ con.addNewConnective();
+
+ assertEquals( 1,
+ con.connectives.length );
+ assertNotNull( con.connectives[0] );
+
+ con.addNewConnective();
+
+ assertEquals( 2,
+ con.connectives.length );
+ assertNotNull( con.connectives[1] );
+
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DSLSentenceTest.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DSLSentenceTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DSLSentenceTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DSLSentenceTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,26 @@
+package org.drools.guvnor.modeldriven;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
+
+public class DSLSentenceTest extends TestCase {
+
+ public void testSentence() {
+
+ final DSLSentence sen = new DSLSentence();
+ sen.sentence = "this is {something} here and {here}";
+ assertEquals( "this is something here and here",
+ sen.toString() );
+
+ sen.sentence = "foo bar";
+ assertEquals( "foo bar",
+ sen.toString() );
+
+ final DSLSentence newOne = sen.copy();
+ assertFalse( newOne == sen );
+ assertEquals( newOne.sentence,
+ sen.sentence );
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DataEnumLoaderTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,126 @@
+package org.drools.guvnor.modeldriven;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.server.util.DataEnumLoader;
+import org.mvel.MVEL;
+import org.mvel.templates.TemplateRuntime;
+
+public class DataEnumLoaderTest extends TestCase {
+
+ public void testEnumGeneration() throws Exception {
+
+
+
+ Object result = MVEL.eval("[2, 3, 4, ]", new HashMap());
+ assertTrue(result instanceof List);
+ List l = (List) result;
+ assertEquals(3, l.size());
+
+ result = MVEL.eval("['Person.age' : [2, 3]\n 'Person.name' : ['qqq', \n'ccc']]", new HashMap());
+
+
+
+
+ DataEnumLoader loader = new DataEnumLoader(readLines().toString());
+
+ assertFalse(loader.getErrors().toString(), loader.hasErrors());
+
+ Map enumeration = (Map) loader.getData();
+ assertEquals(loader.getErrors().toString(), 0, loader.getErrors().size());
+ assertEquals(3, enumeration.size());
+
+ String[] list = (String[]) enumeration.get("Person.age");
+ assertEquals(4, list.length);
+ assertEquals("1", list[0]);
+ assertEquals("2", list[1]);
+
+ list = (String[]) enumeration.get("Person.rating");
+ assertEquals(2, list.length);
+ assertEquals("High", list[0]);
+ assertEquals("Low", list[1]);
+
+
+
+
+ loader = new DataEnumLoader("goober poo error");
+ assertEquals(0, loader.getData().size());
+ assertFalse(loader.getErrors().size() == 0);
+ assertTrue(loader.hasErrors());
+
+ }
+
+
+
+ public void testNoOp() {
+ DataEnumLoader loader = new DataEnumLoader(" ");
+ assertFalse(loader.hasErrors());
+ assertEquals(0, loader.getData().size());
+
+ loader = new DataEnumLoader("");
+ assertFalse(loader.hasErrors());
+ assertEquals(0, loader.getData().size());
+
+ }
+
+ public void testLiteralHelperUtilityClass() {
+ //this shows how you can load it up with a class (which should return a map of keys to List.
+ DataEnumLoader loader = new DataEnumLoader("=(new org.drools.brms.modeldriven.SampleDataSource2()).loadData()");
+
+ assertFalse(loader.hasErrors());
+
+ assertEquals(1, loader.getData().size());
+ String[] res = (String[]) loader.getData().get("whee");
+ assertEquals(2, res.length);
+ assertEquals("hey", res[0]);
+ assertEquals("ho", res[1]);
+
+ }
+
+
+ public void testNewLines() {
+ String s = "yeah yeah, \nyeah \nyeah";
+ assertEquals("yeah yeah,\nyeah,\nyeah", DataEnumLoader.addCommasForNewLines( s ));
+ }
+
+ public void testLazyString() {
+ //in this case we are dealing with an expression which will not be resolved at load time.
+ DataEnumLoader loader = new DataEnumLoader("'Person.type[sex]' : 'something @{sex}'");
+ assertFalse(loader.hasErrors());
+
+ Map data = loader.getData();
+ String s = (String) data.get("Person.type[sex]");
+ assertEquals("something @{sex}", s);
+ Map context = new HashMap() {{ put("sex", "cool"); }};
+
+ Object r = TemplateRuntime.eval(s, context);
+
+ assertEquals("something cool", r);
+
+ loader = new DataEnumLoader("'Person.type[sex, money]' : '@{sex} @{money}'");
+ assertFalse(loader.hasErrors());
+
+ s = (String) loader.getData().get("Person.type[sex, money]");
+ assertEquals("@{sex} @{money}", s);
+
+ }
+
+ private StringBuffer readLines() throws IOException {
+ BufferedReader r = new BufferedReader(new InputStreamReader(this.getClass().getResourceAsStream("Some.enumeration")));
+ String line = "";
+ StringBuffer buf = new StringBuffer();
+ while ((line = r.readLine()) != null) {
+ buf.append(line); buf.append('\n');
+ }
+ return buf;
+ }
+
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/FactPatternTest.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/FactPatternTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/FactPatternTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/FactPatternTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,101 @@
+package org.drools.guvnor.modeldriven;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+
+public class FactPatternTest extends TestCase {
+
+ public void testAddConstraint() {
+ final FactPattern p = new FactPattern();
+ final SingleFieldConstraint x = new SingleFieldConstraint( "x" );
+ p.addConstraint( x );
+
+ assertEquals( 1,
+ p.constraintList.constraints.length );
+ assertEquals( x,
+ p.constraintList.constraints[0] );
+
+ final SingleFieldConstraint y = new SingleFieldConstraint( "y" );
+
+ p.addConstraint( y );
+ assertEquals( 2,
+ p.constraintList.constraints.length );
+ assertEquals( x,
+ p.constraintList.constraints[0] );
+ assertEquals( y,
+ p.constraintList.constraints[1] );
+
+ }
+
+ public void testWithCompositeNesting() {
+ final FactPattern p = new FactPattern();
+ final SingleFieldConstraint x = new SingleFieldConstraint( "x" );
+ p.addConstraint( x );
+
+ assertEquals( 1,
+ p.constraintList.constraints.length );
+ assertEquals( x,
+ p.constraintList.constraints[0] );
+
+ final CompositeFieldConstraint y = new CompositeFieldConstraint();
+
+ y.addConstraint( new SingleFieldConstraint("y") );
+ y.addConstraint( new SingleFieldConstraint("z") );
+ p.addConstraint( y );
+
+ assertEquals( 2,
+ p.constraintList.constraints.length );
+ assertEquals( x,
+ p.constraintList.constraints[0] );
+ assertEquals( y,
+ p.constraintList.constraints[1] );
+
+
+
+ }
+
+ public void testRemoveConstraint() {
+ final FactPattern p = new FactPattern();
+ final SingleFieldConstraint x = new SingleFieldConstraint( "x" );
+ p.addConstraint( x );
+ final SingleFieldConstraint y = new SingleFieldConstraint( "y" );
+ p.addConstraint( y );
+
+ assertEquals( 2,
+ p.constraintList.constraints.length );
+
+ p.removeConstraint( 1 );
+
+ assertEquals( 1,
+ p.constraintList.constraints.length );
+
+ assertEquals( x,
+ p.constraintList.constraints[0] );
+
+
+
+ }
+
+ public void testIsBound() {
+ FactPattern pat = new FactPattern();
+ pat.boundName = "x";
+ assertTrue(pat.isBound());
+
+ pat = new FactPattern();
+ assertFalse(pat.isBound());
+ }
+
+ public void testGetFieldConstraints() {
+ FactPattern pat = new FactPattern();
+ assertEquals(0, pat.getFieldConstraints().length);
+ assertNull(pat.constraintList);
+
+ pat.addConstraint( new SingleFieldConstraint() );
+ assertNotNull(pat.constraintList);
+ assertEquals(1, pat.getFieldConstraints().length);
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/RuleModelTest.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/RuleModelTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/RuleModelTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/RuleModelTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,386 @@
+package org.drools.guvnor.modeldriven;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.client.modeldriven.brl.ActionRetractFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.IAction;
+import org.drools.guvnor.client.modeldriven.brl.IPattern;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+
+import com.thoughtworks.xstream.XStream;
+
+public class RuleModelTest extends TestCase {
+
+ public void testBoundFactFinder() {
+ final RuleModel model = new RuleModel();
+
+ assertNull( model.getBoundFact( "x" ) );
+ model.lhs = new IPattern[3];
+
+ final FactPattern x = new FactPattern( "Car" );
+ model.lhs[0] = x;
+ x.boundName = "x";
+
+ assertNotNull( model.getBoundFact( "x" ) );
+ assertEquals( x,
+ model.getBoundFact( "x" ) );
+
+ final FactPattern y = new FactPattern( "Car" );
+ model.lhs[1] = y;
+ y.boundName = "y";
+
+ final FactPattern other = new FactPattern( "House" );
+ model.lhs[2] = other;
+
+ assertEquals( y,
+ model.getBoundFact( "y" ) );
+ assertEquals( x,
+ model.getBoundFact( "x" ) );
+
+ model.rhs = new IAction[1];
+ final ActionSetField set = new ActionSetField();
+ set.variable = "x";
+ model.rhs[0] = set;
+
+ assertTrue( model.isBoundFactUsed( "x" ) );
+ assertFalse( model.isBoundFactUsed( "y" ) );
+
+ assertEquals( 3,
+ model.lhs.length );
+ assertFalse( model.removeLhsItem( 0 ) );
+ assertEquals( 3,
+ model.lhs.length );
+
+ final ActionRetractFact fact = new ActionRetractFact( "q" );
+ model.rhs[0] = fact;
+ assertTrue( model.isBoundFactUsed( "q" ) );
+ assertFalse( model.isBoundFactUsed( "x" ) );
+
+ final XStream xt = new XStream();
+ xt.alias( "rule",
+ RuleModel.class );
+ xt.alias( "fact",
+ FactPattern.class );
+ xt.alias( "retract",
+ ActionRetractFact.class );
+
+ final String brl = xt.toXML( model );
+
+ System.out.println( brl );
+ }
+
+ public void testScopedVariables() {
+
+ //setup the data...
+
+ final RuleModel model = new RuleModel();
+ model.lhs = new IPattern[3];
+ final FactPattern x = new FactPattern( "Car" );
+ model.lhs[0] = x;
+ x.boundName = "x";
+
+ final FactPattern y = new FactPattern( "Car" );
+ model.lhs[1] = y;
+ y.boundName = "y";
+ final SingleFieldConstraint[] cons = new SingleFieldConstraint[2];
+ y.constraintList = new CompositeFieldConstraint();
+ y.constraintList.constraints = cons;
+ cons[0] = new SingleFieldConstraint( "age" );
+ cons[1] = new SingleFieldConstraint( "make" );
+ cons[0].fieldBinding = "qbc";
+ cons[0].connectives = new ConnectiveConstraint[1];
+ cons[0].connectives[0] = new ConnectiveConstraint( "&",
+ "x" );
+ cons[0].connectives[0].constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
+
+ final FactPattern other = new FactPattern( "House" );
+ model.lhs[2] = other;
+ other.boundName = "q";
+ final SingleFieldConstraint[] cons2 = new SingleFieldConstraint[1];
+ cons2[0] = new SingleFieldConstraint();
+ other.constraintList = new CompositeFieldConstraint();
+ other.constraintList.constraints = cons2;
+
+ //check the results for correct scope
+ List vars = model.getBoundVariablesInScope( cons[0] );
+ assertEquals( 1,
+ vars.size() );
+ assertEquals( "x",
+ vars.get( 0 ) );
+
+ vars = model.getBoundVariablesInScope( cons[0].connectives[0] );
+ assertEquals( 1,
+ vars.size() );
+ assertEquals( "x",
+ vars.get( 0 ) );
+
+ vars = model.getBoundVariablesInScope( cons[1] );
+ assertEquals( 2,
+ vars.size() );
+ assertEquals( "x",
+ vars.get( 0 ) );
+ assertEquals( "qbc",
+ vars.get( 1 ) );
+
+ vars = model.getBoundVariablesInScope( cons[0] );
+ assertEquals( 1,
+ vars.size() );
+ assertEquals( "x",
+ vars.get( 0 ) );
+
+ vars = model.getBoundVariablesInScope( cons2[0] );
+ assertEquals( 3,
+ vars.size() );
+ assertEquals( "x",
+ vars.get( 0 ) );
+ assertEquals( "qbc",
+ vars.get( 1 ) );
+ assertEquals( "y",
+ vars.get( 2 ) );
+ }
+
+ public void testScopedVariablesWithCompositeFact() {
+ RuleModel m = new RuleModel();
+ FactPattern p = new FactPattern();
+ CompositeFieldConstraint cf = new CompositeFieldConstraint();
+ cf.addConstraint( new SingleFieldConstraint("x") );
+ p.addConstraint( cf );
+ SingleFieldConstraint sf = new SingleFieldConstraint("q");
+ sf.fieldBinding = "abc";
+
+ p.addConstraint( sf );
+ SingleFieldConstraint sf2 = new SingleFieldConstraint("q");
+ sf2.fieldBinding = "qed";
+ cf.addConstraint( sf2 );
+ m.addLhsItem( p );
+
+ List vars = m.getAllVariables();
+ assertEquals(1, vars.size());
+ assertEquals("abc", vars.get( 0 ));
+ }
+
+ public void testBindingList() {
+ final RuleModel model = new RuleModel();
+
+ model.lhs = new IPattern[3];
+ final FactPattern x = new FactPattern( "Car" );
+ model.lhs[0] = x;
+ x.boundName = "x";
+
+ final FactPattern y = new FactPattern( "Car" );
+ model.lhs[1] = y;
+ y.boundName = "y";
+
+ final FactPattern other = new FactPattern( "House" );
+ model.lhs[2] = other;
+
+ final List b = model.getBoundFacts();
+ assertEquals( 2,
+ b.size() );
+
+ assertEquals( "x",
+ b.get( 0 ) );
+ assertEquals( "y",
+ b.get( 1 ) );
+
+ }
+
+ public void testAllVariableBindings() {
+ final RuleModel model = new RuleModel();
+ model.lhs = new IPattern[2];
+ final FactPattern x = new FactPattern( "Car" );
+ model.lhs[0] = x;
+ x.boundName = "boundFact";
+
+ SingleFieldConstraint sfc = new SingleFieldConstraint("q");
+ x.addConstraint( sfc );
+ sfc.fieldBinding = "field1";
+
+ SingleFieldConstraint sfc2 = new SingleFieldConstraint("q");
+ x.addConstraint( sfc2 );
+ sfc2.fieldBinding = "field2";
+
+
+ model.lhs[1] = new CompositeFactPattern();
+
+ List vars = model.getAllVariables();
+ assertEquals(3, vars.size());
+ assertEquals("boundFact", vars.get( 0 ));
+ assertEquals("field1", vars.get( 1 ));
+ assertEquals("field2", vars.get( 2 ));
+
+ assertTrue(model.isVariableNameUsed( "field2" ));
+
+ }
+
+ public void testGetVariableNameForRHS() {
+ RuleModel m = new RuleModel();
+ m.name = "blah";
+
+ FactPattern pat = new FactPattern();
+ pat.boundName = "pat";
+ pat.factType = "Person";
+
+ m.addLhsItem( pat );
+
+ List l = m.getAllVariables();
+ assertEquals( 1, l.size() );
+ assertEquals("pat", l.get( 0 ));
+
+ }
+
+ public void testRemoveItemLhs() {
+ final RuleModel model = new RuleModel();
+
+ model.lhs = new IPattern[3];
+ final FactPattern x = new FactPattern( "Car" );
+ model.lhs[0] = x;
+ x.boundName = "x";
+
+ final FactPattern y = new FactPattern( "Car" );
+ model.lhs[1] = y;
+ y.boundName = "y";
+
+ final FactPattern other = new FactPattern( "House" );
+ model.lhs[2] = other;
+
+ assertEquals( 3,
+ model.lhs.length );
+ assertEquals( x,
+ model.lhs[0] );
+
+ model.removeLhsItem( 0 );
+
+ assertEquals( 2,
+ model.lhs.length );
+ assertEquals( y,
+ model.lhs[0] );
+ }
+
+ public void testRemoveItemRhs() {
+ final RuleModel model = new RuleModel();
+
+ model.rhs = new IAction[3];
+ final ActionRetractFact r0 = new ActionRetractFact( "x" );
+ final ActionRetractFact r1 = new ActionRetractFact( "y" );
+ final ActionRetractFact r2 = new ActionRetractFact( "z" );
+
+ model.rhs[0] = r0;
+ model.rhs[1] = r1;
+ model.rhs[2] = r2;
+
+ model.removeRhsItem( 1 );
+
+ assertEquals( 2,
+ model.rhs.length );
+ assertEquals( r0,
+ model.rhs[0] );
+ assertEquals( r2,
+ model.rhs[1] );
+ }
+
+ public void testAddItemLhs() {
+ final RuleModel model = new RuleModel();
+ final FactPattern x = new FactPattern();
+ model.addLhsItem( x );
+ assertEquals( 1,
+ model.lhs.length );
+
+ final FactPattern y = new FactPattern();
+ model.addLhsItem( y );
+
+ assertEquals( 2,
+ model.lhs.length );
+ assertEquals( x,
+ model.lhs[0] );
+ assertEquals( y,
+ model.lhs[1] );
+
+ }
+
+ public void testAddItemRhs() {
+ final RuleModel model = new RuleModel();
+ final IAction a0 = new ActionSetField();
+ final IAction a1 = new ActionSetField();
+
+ model.addRhsItem( a0 );
+
+ assertEquals( 1,
+ model.rhs.length );
+ model.addRhsItem( a1 );
+
+ assertEquals( 2,
+ model.rhs.length );
+
+ assertEquals( a0,
+ model.rhs[0] );
+ assertEquals( a1,
+ model.rhs[1] );
+ }
+
+ public void testAttributes() {
+ final RuleModel m = new RuleModel();
+ final RuleAttribute at = new RuleAttribute( "salience",
+ "42" );
+ m.addAttribute( at );
+ assertEquals( 1,
+ m.attributes.length );
+ assertEquals( at,
+ m.attributes[0] );
+
+ final RuleAttribute at2 = new RuleAttribute( "agenda-group",
+ "x" );
+ m.addAttribute( at2 );
+ assertEquals( 2,
+ m.attributes.length );
+ assertEquals( at2,
+ m.attributes[1] );
+
+ m.removeAttribute( 0 );
+ assertEquals( 1,
+ m.attributes.length );
+ assertEquals( at2,
+ m.attributes[0] );
+ }
+
+ public void testIsDSLEnhanced() throws Exception {
+ RuleModel m = new RuleModel();
+
+ assertFalse(m.hasDSLSentences());
+
+ m.addLhsItem( new FactPattern() );
+ assertFalse(m.hasDSLSentences());
+
+ m.addRhsItem( new ActionSetField("q") );
+
+ assertFalse(m.hasDSLSentences());
+
+ m.addLhsItem( new DSLSentence() );
+ assertTrue(m.hasDSLSentences());
+
+ m.addRhsItem( new DSLSentence() );
+ assertTrue(m.hasDSLSentences());
+
+ m = new RuleModel();
+
+ m.addLhsItem( new DSLSentence() );
+ assertTrue(m.hasDSLSentences());
+
+ m = new RuleModel();
+ m.addRhsItem( new DSLSentence() );
+ assertTrue(m.hasDSLSentences());
+
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/SampleDataSource.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/SampleDataSource.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/SampleDataSource.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/SampleDataSource.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,15 @@
+package org.drools.guvnor.modeldriven;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SampleDataSource {
+
+ public static List getData() {
+ return new ArrayList() {{
+ add("Hello");
+ add("World");
+ }};
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/SampleDataSource2.java (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/SampleDataSource2.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/SampleDataSource2.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/SampleDataSource2.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,21 @@
+package org.drools.guvnor.modeldriven;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SampleDataSource2 {
+
+ public Map loadData() {
+ Map data = new HashMap();
+
+ List d = new ArrayList();
+ d.add("hey");
+ d.add("ho");
+ data.put("whee", d);
+
+ return data;
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/dt (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt)
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/dt/GuidedDecisionTableTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/GuidedDecisionTableTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/dt/GuidedDecisionTableTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,16 +1,16 @@
-package org.drools.brms.modeldriven.dt;
+package org.drools.guvnor.modeldriven.dt;
import java.util.HashMap;
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.dt.ActionInsertFactCol;
-import org.drools.brms.client.modeldriven.dt.ActionSetFieldCol;
-import org.drools.brms.client.modeldriven.dt.AttributeCol;
-import org.drools.brms.client.modeldriven.dt.ConditionCol;
-import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.dt.ActionInsertFactCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.guvnor.client.modeldriven.dt.AttributeCol;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
public class GuidedDecisionTableTest extends TestCase {
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/package.html (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/package.html)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/package.html (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/package.html 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,10 @@
+<body>
+This contains utilities and widgets for the model driven/scorecard style way of
+editing a rule.
+
+This has the interesting feature of being able to work over standard DRL, no special markup needed.
+Its actually a subset of DRL, complex structures and semantics can not be supported.
+
+However, this can be augmented with DSLs which can express any construct needed.
+
+</body>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/converter (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/converter)
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/rules)
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SomeFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/rules/SomeFact.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SomeFact.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.rules;
+package org.drools.guvnor.server.rules;
import java.math.BigDecimal;
import java.math.BigInteger;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/rules/SuggestionCompletionLoaderTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,10 +1,11 @@
-package org.drools.brms.server.rules;
+package org.drools.guvnor.server.rules;
import java.util.ArrayList;
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.server.rules.SuggestionCompletionLoader;
public class SuggestionCompletionLoaderTest extends TestCase {
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util (from rev 20603, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util)
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRDRLPersistenceTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,22 +1,24 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brl.ActionInsertLogicalFact;
-import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.RuleAttribute;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertLogicalFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionRetractFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionUpdateField;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.server.util.BRDRLPersistence;
+import org.drools.guvnor.server.util.BRLPersistence;
public class BRDRLPersistenceTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRLPersitenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRLPersitenceTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -6,20 +6,22 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.RuleAttribute;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionRetractFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionUpdateField;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.server.util.BRLPersistence;
+import org.drools.guvnor.server.util.BRXMLPersistence;
public class BRLPersitenceTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/GuidedDTDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/GuidedDTDRLPersistenceTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,26 +1,28 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import java.util.ArrayList;
import java.util.List;
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brl.ActionSetField;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.RuleAttribute;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
-import org.drools.brms.client.modeldriven.dt.ActionCol;
-import org.drools.brms.client.modeldriven.dt.ActionInsertFactCol;
-import org.drools.brms.client.modeldriven.dt.ActionRetractFactCol;
-import org.drools.brms.client.modeldriven.dt.ActionSetFieldCol;
-import org.drools.brms.client.modeldriven.dt.AttributeCol;
-import org.drools.brms.client.modeldriven.dt.ConditionCol;
-import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionRetractFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.dt.ActionCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionInsertFactCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionRetractFactCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.guvnor.client.modeldriven.dt.AttributeCol;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.server.util.BRDRLPersistence;
+import org.drools.guvnor.server.util.GuidedDTDRLPersistence;
public class GuidedDTDRLPersistenceTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/GuidedDTXMLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTXMLPersistenceTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/GuidedDTXMLPersistenceTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,10 +1,11 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
-import org.drools.brms.client.modeldriven.dt.ActionInsertFactCol;
-import org.drools.brms.client.modeldriven.dt.ActionSetFieldCol;
-import org.drools.brms.client.modeldriven.dt.AttributeCol;
-import org.drools.brms.client.modeldriven.dt.ConditionCol;
-import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.client.modeldriven.dt.ActionInsertFactCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.guvnor.client.modeldriven.dt.AttributeCol;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.server.util.GuidedDTXMLPersistence;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ScenarioXMLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/ScenarioXMLPersistenceTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ScenarioXMLPersistenceTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,15 +1,16 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import java.util.ArrayList;
import java.util.List;
-import org.drools.brms.client.modeldriven.testing.ExecutionTrace;
-import org.drools.brms.client.modeldriven.testing.FactData;
-import org.drools.brms.client.modeldriven.testing.FieldData;
-import org.drools.brms.client.modeldriven.testing.Scenario;
-import org.drools.brms.client.modeldriven.testing.VerifyFact;
-import org.drools.brms.client.modeldriven.testing.VerifyField;
-import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
+import org.drools.guvnor.client.modeldriven.testing.FactData;
+import org.drools.guvnor.client.modeldriven.testing.FieldData;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyField;
+import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.guvnor.server.util.ScenarioXMLPersistence;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/SuggestionCompletionEngineBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilderTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/SuggestionCompletionEngineBuilderTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,8 +1,9 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.server.util.SuggestionCompletionEngineBuilder;
public class SuggestionCompletionEngineBuilderTest extends TestCase {
SuggestionCompletionEngineBuilder builder = new SuggestionCompletionEngineBuilder();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactDataTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactDataTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactDataTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -2,8 +2,8 @@
import java.util.ArrayList;
-import org.drools.brms.client.modeldriven.testing.FactData;
-import org.drools.brms.client.modeldriven.testing.FieldData;
+import org.drools.guvnor.client.modeldriven.testing.FactData;
+import org.drools.guvnor.client.modeldriven.testing.FieldData;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -15,16 +15,16 @@
import org.drools.base.ClassTypeResolver;
import org.drools.base.TypeResolver;
import org.drools.base.mvel.DroolsMVELFactory;
-import org.drools.brms.client.modeldriven.testing.ExecutionTrace;
-import org.drools.brms.client.modeldriven.testing.Expectation;
-import org.drools.brms.client.modeldriven.testing.FactData;
-import org.drools.brms.client.modeldriven.testing.FieldData;
-import org.drools.brms.client.modeldriven.testing.RetractFact;
-import org.drools.brms.client.modeldriven.testing.Scenario;
-import org.drools.brms.client.modeldriven.testing.VerifyFact;
-import org.drools.brms.client.modeldriven.testing.VerifyField;
-import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
import org.drools.common.InternalWorkingMemory;
+import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
+import org.drools.guvnor.client.modeldriven.testing.Expectation;
+import org.drools.guvnor.client.modeldriven.testing.FactData;
+import org.drools.guvnor.client.modeldriven.testing.FieldData;
+import org.drools.guvnor.client.modeldriven.testing.RetractFact;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyField;
+import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
import org.drools.rule.TimeMachine;
public class ScenarioRunnerTest extends RuleUnit {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -6,13 +6,13 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.testing.ExecutionTrace;
-import org.drools.brms.client.modeldriven.testing.FactData;
-import org.drools.brms.client.modeldriven.testing.RetractFact;
-import org.drools.brms.client.modeldriven.testing.Scenario;
-import org.drools.brms.client.modeldriven.testing.VerifyFact;
-import org.drools.brms.client.modeldriven.testing.VerifyField;
-import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
+import org.drools.guvnor.client.modeldriven.testing.FactData;
+import org.drools.guvnor.client.modeldriven.testing.RetractFact;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyField;
+import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
public class ScenarioTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-guvnor/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/.classpath 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/.classpath 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,10 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="src/main/resources" path="src/main/resources"/>
- <classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.4.60/gwt-servlet-1.4.60.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/gwtext/gwtext/2.0.1/gwtext-2.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6/dom4j-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/emma/emma/2.0.5312/emma-2.0.5312.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
+ <classpathentry kind="src" path="/drools-decisiontables"/>
+ <classpathentry kind="src" path="/drools-templates"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="src" path="/drools-repository"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.1/jackrabbit-core-1.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2-SNAPSHOT/jboss-security-acl-impl-2.0.2-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR4/jboss-security-spi-2.0.2.CR4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl/2.0.2-SNAPSHOT/jboss-security-acl-2.0.2-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
+ <classpathentry kind="src" path="/drools-verifier"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.0.2.GA/jboss-seam-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/el/jboss-el/2.0.1.GA/jboss-el-2.0.1.GA.jar"/>
+</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/.project
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/.project 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/.project 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,28 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>drools-jbrms</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-verifier</project>
- <project>drools-compiler</project>
- <project>drools-core</project>
- <project>drools-decisiontables</project>
- <project>drools-repository</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+ <name>drools-guvnor</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-compiler</project>
+ <project>drools-core</project>
+ <project>drools-decisiontables</project>
+ <project>drools-templates</project>
+ <project>drools-repository</project>
+ <project>drools-verifier</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/build.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/build.xml 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/build.xml 2008-06-19 01:48:27 UTC (rev 20604)
@@ -6,7 +6,7 @@
@author Michael Neale
-->
-<project name="org.drools.brms.JBRMS" default="gwt-compile" basedir="." xmlns:gwt="antlib:de.samaflost.gwttasks">
+<project name="org.drools.guvnor.Guvnor" default="gwt-compile" basedir="." xmlns:gwt="antlib:de.samaflost.gwttasks">
<taskdef uri="antlib:de.samaflost.gwttasks"
resource="de/samaflost/gwttasks/antlib.xml"
classpath="../lib/gwttasks.jar"/>
@@ -16,7 +16,7 @@
<target name="gwt-compile">
<gwt:compile outDir="src/main/webapp"
gwtHome="${gwt.home}"
- classBase="org.drools.brms.JBRMS"
+ classBase="org.drools.guvnor.Guvnor"
sourceclasspath="src/main/java; ../drools-compiler/src/main/java; ../lib/gwtext-2.0.1.jar"
/>
</target>
@@ -26,7 +26,7 @@
bindir="target/classes"
outDir="src/main/webapp"
gwtHome="${gwt.home}"
- startPage="org.drools.brms.JBRMS/JBRMS.html"
+ startPage="org.drools.guvnor.Guvnor/Guvnor.html"
/>
</target>
</project>
Deleted: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/JBRMS.gwt.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/JBRMS.gwt.xml 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/JBRMS.gwt.xml 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,24 +0,0 @@
-<module>
-
- <!-- Inherit the core Web Toolkit stuff. -->
- <inherits name='com.google.gwt.user.User'/>
- <inherits name="com.gwtext.GwtExt"/>
-
- <!-- Specify the app entry point class. -->
- <!-- <entry-point class='org.drools.brms.client.JBRMS'/> -->
- <entry-point class='org.drools.brms.client.JBRMSEntryPoint'/>
-
- <stylesheet src="js/ext/resources/css/ext-all.css" />
- <script src="js/ext/adapter/ext/ext-base.js" />
- <script src="js/ext/ext-all.js" />
-
-
- <servlet path="/jbrmsService" class="org.jboss.seam.remoting.gwt.GWTRemoteServiceServlet" />
- <servlet path="/asset" class="org.drools.brms.server.files.AssetFileServlet"/>
- <servlet path="/backup" class="org.drools.brms.server.files.RepositoryBackupServlet"/>
- <servlet path="/package" class="org.drools.brms.server.files.PackageDeploymentServlet"/>
- <servlet path="/webdav" class="org.drools.brms.server.files.WebdavServlet"/>
- <servlet path="/api" class="org.drools.brms.server.files.RestAPIServlet"/>
-
-
-</module>
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/JBRMS.gwt.xml (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/JBRMS.gwt.xml)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/JBRMS.gwt.xml (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/JBRMS.gwt.xml 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,24 @@
+<module>
+
+ <!-- Inherit the core Web Toolkit stuff. -->
+ <inherits name='com.google.gwt.user.User'/>
+ <inherits name="com.gwtext.GwtExt"/>
+
+ <!-- Specify the app entry point class. -->
+ <!-- <entry-point class='org.drools.brms.client.JBRMS'/> -->
+ <entry-point class='org.drools.brms.client.JBRMSEntryPoint'/>
+
+ <stylesheet src="js/ext/resources/css/ext-all.css" />
+ <script src="js/ext/adapter/ext/ext-base.js" />
+ <script src="js/ext/ext-all.js" />
+
+
+ <servlet path="/jbrmsService" class="org.jboss.seam.remoting.gwt.GWTRemoteServiceServlet" />
+ <servlet path="/asset" class="org.drools.brms.server.files.AssetFileServlet"/>
+ <servlet path="/backup" class="org.drools.brms.server.files.RepositoryBackupServlet"/>
+ <servlet path="/package" class="org.drools.brms.server.files.PackageDeploymentServlet"/>
+ <servlet path="/webdav" class="org.drools.brms.server.files.WebdavServlet"/>
+ <servlet path="/api" class="org.drools.brms.server.files.RestAPIServlet"/>
+
+
+</module>
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/JBRMSEntryPoint.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/JBRMSEntryPoint.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/JBRMSEntryPoint.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/JBRMSEntryPoint.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.drools.guvnor.client;
+
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.UserSecurityContext;
+
+import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.HistoryListener;
+import com.google.gwt.user.client.ui.RootPanel;
+import com.google.gwt.user.client.ui.Widget;
+import com.gwtext.client.util.CSS;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.QuickTips;
+import com.gwtext.client.widgets.Viewport;
+import com.gwtext.client.widgets.form.Field;
+
+/**
+ * This is the main launching/entry point for the JBRMS web console.
+ * It essentially sets the initial layout.
+ *
+ * If you hadn't noticed, this is using GWT from google. Refer to GWT docs
+ * if GWT is new to you (it is quite a different way of building web apps).
+ */
+public class JBRMSEntryPoint
+ implements
+ EntryPoint, HistoryListener {
+
+ private LoggedInUserInfo loggedInUserInfo;
+
+ public void onModuleLoad() {
+ //DOM.removeChild(RootPanel.getBodyElement(), DOM.getElementById("loadingMessage"));
+ Field.setMsgTarget("side");
+ QuickTips.init();
+ CSS.swapStyleSheet("theme", "js/ext/resources/css/xtheme-gray.css");
+ loggedInUserInfo = new LoggedInUserInfo();
+ loggedInUserInfo.setVisible(false);
+ checkLoggedIn();
+ }
+
+ private Panel createMain() {
+ return (new ExplorerLayoutManager(loggedInUserInfo)).getBaseLayout();
+ }
+
+
+ /**
+ * Check if user is logged in, if not, then show prompt.
+ * If it is, then we show the app, in all its glory !
+ */
+ private void checkLoggedIn() {
+ RepositoryServiceFactory.getSecurityService().getCurrentUser( new GenericCallback() {
+ public void onSuccess(Object data) {
+ UserSecurityContext ctx = (UserSecurityContext) data;
+ if ( ctx.userName != null ) {
+ loggedInUserInfo.setUserName( ctx.userName );
+ loggedInUserInfo.setVisible( true );
+ new Viewport(createMain());
+ //RootPanel.get().add(createMain());
+ } else {
+ final LoginWidget lw = new LoginWidget();
+ lw.setLoggedInEvent(new Command() {
+ public void execute() {
+ loggedInUserInfo.setUserName( lw.getUserName() );
+ loggedInUserInfo.setVisible( true );
+ new Viewport(createMain());
+ //RootPanel.get().add(createMain());
+
+ }
+ } );
+ lw.show();
+ }
+ }
+ } );
+ }
+
+ public void onHistoryChanged(String a) {
+
+
+ }
+
+
+}
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoggedInUserInfo.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/LoggedInUserInfo.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoggedInUserInfo.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoggedInUserInfo.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,79 @@
+package org.drools.guvnor.client;
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.UserSecurityContext;
+
+import com.google.gwt.user.client.Timer;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTML;
+
+/**
+ * Simple widget to show who is logged in, and a link to logout.
+ * @author Fernando Meyer
+ */
+public class LoggedInUserInfo extends Composite{
+ private HTML widgetcontent;
+
+
+ public LoggedInUserInfo() {
+ widgetcontent = new HTML();
+ initWidget( widgetcontent );
+ }
+
+ public void setUserName(String userName) {
+ StringBuffer content = new StringBuffer();
+ content.append( "<div class='headerUserInfo'>" );
+ content.append( "<small>Welcome: " + userName );
+ content.append( " <a href='logout.jsp'>[Sign Out]</a></small>" );
+ content.append( "</div>" );
+ widgetcontent.setHTML( content.toString() );
+
+ //we have the timer to keep the session alive.
+ Timer timer = new Timer() {
+
+ public void run() {
+ RepositoryServiceFactory.getSecurityService().getCurrentUser( new AsyncCallback() {
+
+ public void onFailure(Throwable t) {
+ }
+
+ public void onSuccess(Object o) {
+ UserSecurityContext ctx = (UserSecurityContext) o;
+ if (ctx.userName == null) {
+ GenericCallback.showSessionExpiry();
+ }
+ }
+
+ });
+ }
+
+ };
+
+ timer.scheduleRepeating( 300000 );
+
+
+ }
+
+
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoginWidget.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/LoginWidget.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoginWidget.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoginWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,116 @@
+package org.drools.guvnor.client;
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.PasswordTextBox;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
+import com.gwtext.client.core.EventObject;
+
+import com.gwtext.client.widgets.Window;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+import com.gwtext.client.widgets.layout.FitLayout;
+
+/**
+ * Used for logging in, obviously !
+ *
+ * @author Michael Neale
+ */
+public class LoginWidget {
+
+
+
+
+
+
+
+ private Command loggedInEvent;
+ private String userNameLoggedIn;
+
+ public void show() {
+
+ final FormStylePopup pop = new FormStylePopup("images/login.gif", "BRMS login");
+
+
+ final TextBox userName = new TextBox();
+ pop.addAttribute("User name:", userName);
+
+
+ final PasswordTextBox password = new PasswordTextBox();
+ pop.addAttribute("Password: ", password);
+
+ Button b = new Button("OK");
+
+
+ b.addClickListener(new ClickListener() {
+ public void onClick(Widget arg0) {
+ LoadingPopup.showMessage("Authenticating...");
+ RepositoryServiceFactory.login( userName.getText(), password.getText(), new GenericCallback() {
+ public void onSuccess(Object o) {
+ userNameLoggedIn = userName.getText();
+ LoadingPopup.close();
+ Boolean success = (Boolean) o;
+ if (!success.booleanValue()) {
+ com.google.gwt.user.client.Window.alert( "Incorrect username or password." );
+ } else {
+ loggedInEvent.execute();
+ pop.hide();
+ }
+ }
+ });
+ }
+
+ });
+
+
+ pop.addAttribute("", b);
+
+ pop.show();
+
+
+
+
+
+ }
+
+
+
+ /**
+ * Return the name that was entered.
+ */
+ public String getUserName() {
+ return userNameLoggedIn;
+ }
+
+ /**
+ * This is required for a callback after a successful login.
+ */
+ public void setLoggedInEvent(Command loggedInEvent) {
+ this.loggedInEvent = loggedInEvent;
+ }
+
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/admin)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/admin/ArchivedAssetManager.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/ArchivedAssetManager.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,13 +1,13 @@
-package org.drools.brms.client.admin;
+package org.drools.guvnor.client.admin;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.PrettyFormLayout;
-import org.drools.brms.client.explorer.ExplorerViewCenterPanel;
-import org.drools.brms.client.rpc.PackageConfigData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rulelist.AssetItemGrid;
-import org.drools.brms.client.rulelist.AssetItemGridDataLoader;
-import org.drools.brms.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rulelist.AssetItemGrid;
+import org.drools.guvnor.client.rulelist.AssetItemGridDataLoader;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Composite;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/BackupManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/admin/BackupManager.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/BackupManager.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.admin;
+package org.drools.guvnor.client.admin;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,11 +17,11 @@
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.HTMLFileManagerFields;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.common.ErrorPopup;
+import org.drools.guvnor.client.common.HTMLFileManagerFields;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.common.PrettyFormLayout;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Window;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/admin/CategoryManager.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.admin;
+package org.drools.guvnor.client.admin;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,22 +17,22 @@
-import org.drools.brms.client.categorynav.CategoryEditor;
-import org.drools.brms.client.categorynav.CategoryExplorerWidget;
-import org.drools.brms.client.categorynav.CategorySelectHandler;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.PrettyFormLayout;
-import org.drools.brms.client.decisiontable.GuidedDecisionTableWidget;
-import org.drools.brms.client.modeldriven.dt.ActionCol;
-import org.drools.brms.client.modeldriven.dt.ActionSetFieldCol;
-import org.drools.brms.client.modeldriven.dt.AttributeCol;
-import org.drools.brms.client.modeldriven.dt.ConditionCol;
-import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
-import org.drools.brms.client.packages.SuggestionCompletionCache;
-import org.drools.brms.client.rpc.MetaData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.guvnor.client.categorynav.CategoryEditor;
+import org.drools.guvnor.client.categorynav.CategoryExplorerWidget;
+import org.drools.guvnor.client.categorynav.CategorySelectHandler;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.decisiontable.GuidedDecisionTableWidget;
+import org.drools.guvnor.client.modeldriven.dt.ActionCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.guvnor.client.modeldriven.dt.AttributeCol;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.client.packages.SuggestionCompletionCache;
+import org.drools.guvnor.client.rpc.MetaData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.RuleAsset;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Window;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/LogViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/admin/LogViewer.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/LogViewer.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,9 +1,9 @@
-package org.drools.brms.client.admin;
+package org.drools.guvnor.client.admin;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.rpc.LogEntry;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.rpc.LogEntry;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.VerticalPanel;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/StateManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/admin/StateManager.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/StateManager.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.admin;
+package org.drools.guvnor.client.admin;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,10 +17,10 @@
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.PrettyFormLayout;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/categorynav)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/categorynav/CategoryEditor.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.categorynav;
+package org.drools.guvnor.client.categorynav;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,11 +17,11 @@
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.common.ErrorPopup;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryExplorerWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/categorynav/CategoryExplorerWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryExplorerWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.categorynav;
+package org.drools.guvnor.client.categorynav;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,10 +17,10 @@
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.rpc.RepositoryServiceAsync;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.common.ErrorPopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.rpc.RepositoryServiceAsync;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategorySelectHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/categorynav/CategorySelectHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategorySelectHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.categorynav;
+package org.drools.guvnor.client.categorynav;
/*
* Copyright 2005 JBoss Inc
*
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/AssetFormats.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/AssetFormats.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/AssetFormats.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/CompletionItemsAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/CompletionItemsAsync.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/CompletionItemsAsync.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/CompletionItemsAsyncReturn.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/CompletionItemsAsyncReturn.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/CompletionItemsAsyncReturn.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DefaultContentUploadEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/DefaultContentUploadEditor.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DefaultContentUploadEditor.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,8 +1,8 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
-import org.drools.brms.client.packages.AssetAttachmentFileWidget;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.ruleeditor.RuleViewer;
+import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.ruleeditor.RuleViewer;
import com.google.gwt.user.client.ui.HTML;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableComposite.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/DirtyableComposite.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableComposite.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/DirtyableContainer.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableContainer.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/**
* @author fernandomeyer
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/DirtyableFlexTable.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableHorizontalPane.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/DirtyableHorizontalPane.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableHorizontalPane.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Widget;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableVerticalPane.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/DirtyableVerticalPane.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableVerticalPane.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/DirtyableWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ErrorPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/ErrorPopup.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ErrorPopup.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,7 +17,7 @@
-import org.drools.brms.client.rpc.DetailedSerializableException;
+import org.drools.guvnor.client.rpc.DetailedSerializableException;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.SimplePanel;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FieldEditListener.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/FieldEditListener.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FieldEditListener.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStyleLayout.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/FormStyleLayout.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStyleLayout.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStylePopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/FormStylePopup.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStylePopup.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/GenericCallback.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,8 +17,8 @@
-import org.drools.brms.client.rpc.DetailedSerializableException;
-import org.drools.brms.client.rpc.SessionExpiredException;
+import org.drools.guvnor.client.rpc.DetailedSerializableException;
+import org.drools.guvnor.client.rpc.SessionExpiredException;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HTML;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/HTMLFileManagerFields.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/HTMLFileManagerFields.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/HTMLFileManagerFields.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/IDirtyable.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/IDirtyable.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/IDirtyable.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/**
* @author fernandomeyer
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ImageButton.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/ImageButton.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ImageButton.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/InfoPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/InfoPopup.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/InfoPopup.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/LoadingPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/LoadingPopup.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/LoadingPopup.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/PrettyFormLayout.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/PrettyFormLayout.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/PrettyFormLayout.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlexTable;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/RulePackageSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/RulePackageSelector.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/RulePackageSelector.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,8 +19,8 @@
import java.util.Iterator;
-import org.drools.brms.client.rpc.PackageConfigData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/SmallLabel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/SmallLabel.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/SmallLabel.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
import com.google.gwt.user.client.ui.HTML;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/Snapshot.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/Snapshot.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/Snapshot.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
public class Snapshot {
public static final String LATEST_SNAPSHOT = "LATEST";
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/StatusChangePopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/StatusChangePopup.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/StatusChangePopup.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,7 +17,7 @@
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ValidationMessageWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/ValidationMessageWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ValidationMessageWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ValueChanged.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/common/ValueChanged.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ValueChanged.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/**
* Well this should be pretty obvious.
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionInsertColumn.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/decisiontable/ActionInsertColumn.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionInsertColumn.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionInsertColumn.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,261 @@
+package org.drools.guvnor.client.decisiontable;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.InfoPopup;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.dt.ActionCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionInsertFactCol;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
+
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
+
+/**
+ * This is an editor for columns that are for inserting facts.
+ * @author Michael Neale
+ *
+ */
+public class ActionInsertColumn extends FormStylePopup {
+
+ private GuidedDecisionTable dt;
+ private SuggestionCompletionEngine sce;
+ private ActionInsertFactCol editingCol;
+ private SmallLabel patternLabel = new SmallLabel();
+ private TextBox fieldLabel = getFieldLabel();
+
+ public ActionInsertColumn(SuggestionCompletionEngine sce, final GuidedDecisionTable dt, final Command refreshGrid, final ActionInsertFactCol col, final boolean isNew) {
+ this.setModal(false);
+ this.dt = dt;
+ this.sce = sce;
+ this.editingCol = new ActionInsertFactCol();
+ editingCol.boundName = col.boundName;
+ editingCol.type = col.type;
+ editingCol.factField = col.factField;
+ editingCol.factType = col.factType;
+ editingCol.header = col.header;
+ editingCol.valueList = col.valueList;
+
+ setTitle("Action column configuration (inserting a new fact)");
+
+
+
+ HorizontalPanel pattern = new HorizontalPanel();
+ pattern.add(patternLabel );
+ doPatternLabel();
+
+ Image changePattern = new ImageButton("images/edit.gif", "Choose a pattern that this column adds data to", new ClickListener() {
+ public void onClick(Widget w) {
+ showChangePattern(w);
+ }
+ });
+ pattern.add(changePattern);
+ addAttribute("Pattern:", pattern);
+
+ HorizontalPanel field = new HorizontalPanel();
+ field.add(fieldLabel);
+ Image editField = new ImageButton("images/edit.gif", "Edit the field that this column operates on", new ClickListener() {
+ public void onClick(Widget w) {
+ showFieldChange();
+ }
+ });
+ field.add(editField);
+ addAttribute("Field:", field);
+ doFieldLabel();
+
+
+ final TextBox valueList = new TextBox();
+ valueList.setText(editingCol.valueList);
+ valueList.addChangeListener(new ChangeListener() {
+ public void onChange(Widget w) {
+ editingCol.valueList = valueList.getText();
+ }
+ });
+ HorizontalPanel vl = new HorizontalPanel();
+ vl.add(valueList);
+ vl.add(new InfoPopup("Value list", "Value lists are an optional comma separated list of values to show as a drop down."));
+ addAttribute("(optional) value list:", vl);
+
+ final TextBox header = new TextBox();
+ header.setText(col.header);
+ header.addChangeListener(new ChangeListener() {
+ public void onChange(Widget w) {
+ editingCol.header = header.getText();
+ } });
+ addAttribute("Column header (description):", header);
+
+
+ Button apply = new Button("Apply changes");
+ apply.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ if (isNew) {
+ dt.actionCols.add(editingCol);
+ } else {
+ col.boundName = editingCol.boundName;
+ col.type = editingCol.type;
+ col.factField = editingCol.factField;
+ col.factType = editingCol.factType;
+ col.header = editingCol.header;
+ col.valueList = editingCol.valueList;
+ }
+ refreshGrid.execute();
+ hide();
+ }
+ });
+ addAttribute("", apply);
+
+ }
+
+ private TextBox getFieldLabel() {
+ final TextBox box = new TextBox();
+ box.addChangeListener(new ChangeListener() {
+ public void onChange(Widget w) {
+ editingCol.factField = box.getText();
+ }
+ });
+ return box;
+ }
+
+ private void showFieldChange() {
+ final FormStylePopup pop = new FormStylePopup();
+ pop.setModal(false);
+ String[] fields = this.sce.getFieldCompletions(this.editingCol.factType);
+ final ListBox box = new ListBox();
+ for (int i = 0; i < fields.length; i++) {
+ box.addItem(fields[i]);
+ }
+ pop.addAttribute("Field:", box);
+ Button b = new Button("OK");
+ pop.addAttribute("", b);
+ b.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ editingCol.factField = box.getItemText(box.getSelectedIndex());
+ editingCol.type = sce.getFieldType(editingCol.factType, editingCol.factField);
+ doFieldLabel();
+ pop.hide();
+ }
+ });
+ pop.show();
+
+ }
+
+ private void doFieldLabel() {
+ if (nil(this.editingCol.factField)) {
+ fieldLabel.setText("(please choose fact type)");
+ } else {
+ fieldLabel.setText(editingCol.factField);
+ }
+
+ }
+
+ private boolean nil(String s) {
+ return s == null || s.equals("");
+ }
+
+ private void doPatternLabel() {
+ if (this.editingCol.factType != null) {
+ this.patternLabel.setText(this.editingCol.factType + " [" + editingCol.boundName + "]");
+ }
+ }
+
+ protected void showChangePattern(Widget w) {
+
+ final ListBox pats = this.loadPatterns();
+ if (pats.getItemCount() == 0) {
+ showNewPatternDialog();
+ return;
+ }
+ final FormStylePopup pop = new FormStylePopup();
+ Button ok = new Button("OK");
+ HorizontalPanel hp = new HorizontalPanel();
+ hp.add(pats);
+ hp.add(ok);
+
+
+ pop.addAttribute("Choose existing pattern to add column to:", hp);
+ pop.addAttribute("", new HTML("<i><b>---OR---</i></b>"));
+
+ Button createPattern = new Button("Create new fact pattern");
+ createPattern.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ pop.hide();
+ showNewPatternDialog();
+ }
+ });
+ pop.addAttribute("", createPattern);
+
+
+
+
+ ok.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ String[] val = pats.getValue(pats.getSelectedIndex()).split("\\s");
+ editingCol.factType = val[0];
+ editingCol.boundName = val[1];
+ doPatternLabel();
+ pop.hide();
+ }
+ });
+
+ pop.show();
+ }
+
+ protected void showNewPatternDialog() {
+ final FormStylePopup pop = new FormStylePopup();
+ pop.setTitle("New fact - select the type");
+ final ListBox types = new ListBox();
+ for (int i = 0; i < sce.factTypes.length; i++) {
+ types.addItem(sce.factTypes[i]);
+ }
+ pop.addAttribute("Fact type:", types);
+ final TextBox binding = new TextBox();
+ pop.addAttribute("name:", binding);
+
+ Button ok = new Button("OK");
+ ok.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ editingCol.boundName = binding.getText();
+ editingCol.factType = types.getItemText(types.getSelectedIndex());
+ doPatternLabel();
+ pop.hide();
+ }
+ });
+ pop.addAttribute("", ok);
+
+ pop.show();
+ }
+
+ private ListBox loadPatterns() {
+ Set vars = new HashSet();
+ ListBox patterns = new ListBox();
+ for (int i = 0; i < dt.conditionCols.size(); i++) {
+ ActionCol col = (ActionCol) dt.actionCols.get(i);
+ if (col instanceof ActionInsertFactCol) {
+ ActionInsertFactCol c = (ActionInsertFactCol) col;
+ if (!vars.contains(c.boundName)) {
+ patterns.addItem(c.factType + " [" + c.boundName + "]", c.factType + " " + c.boundName);
+ vars.add(c.boundName);
+ }
+ }
+ }
+
+ return patterns;
+
+ }
+
+
+
+}
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionSetColumn.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/decisiontable/ActionSetColumn.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionSetColumn.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionSetColumn.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,219 @@
+package org.drools.guvnor.client.decisiontable;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.InfoPopup;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
+
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
+
+public class ActionSetColumn extends FormStylePopup {
+
+ private ActionSetFieldCol editingCol;
+ private SmallLabel bindingLabel = new SmallLabel();
+ private TextBox fieldLabel = getFieldLabel();
+ private GuidedDecisionTable dt;
+ private SuggestionCompletionEngine sce;
+
+ public ActionSetColumn(SuggestionCompletionEngine sce, final GuidedDecisionTable dt, final Command refreshGrid, final ActionSetFieldCol col, final boolean isNew) {
+ this.editingCol = new ActionSetFieldCol();
+ this.dt = dt;
+ this.sce = sce;
+
+ editingCol.boundName = col.boundName;
+ editingCol.factField = col.factField;
+ editingCol.header = col.header;
+ editingCol.type = col.type;
+ editingCol.valueList = col.valueList;
+ super.setModal(false);
+ setTitle("Column configuration (set a field on a fact)");
+
+
+
+ HorizontalPanel pattern = new HorizontalPanel();
+ pattern.add(bindingLabel);
+ doBindingLabel();
+
+ Image changePattern = new ImageButton("images/edit.gif", "Choose a bound fact that this column pertains to", new ClickListener() {
+ public void onClick(Widget w) {
+ showChangeFact(w);
+ }
+ });
+ pattern.add(changePattern);
+ addAttribute("Fact:", pattern);
+
+
+ HorizontalPanel field = new HorizontalPanel();
+ field.add(fieldLabel);
+ Image editField = new ImageButton("images/edit.gif", "Edit the field that this column operates on", new ClickListener() {
+ public void onClick(Widget w) {
+ showFieldChange();
+ }
+ });
+ field.add(editField);
+ addAttribute("Field:", field);
+ doFieldLabel();
+
+ final TextBox valueList = new TextBox();
+ valueList.setText(editingCol.valueList);
+ valueList.addChangeListener(new ChangeListener() {
+ public void onChange(Widget w) {
+ editingCol.valueList = valueList.getText();
+ }
+ });
+ HorizontalPanel vl = new HorizontalPanel();
+ vl.add(valueList);
+ vl.add(new InfoPopup("Value list", "Value lists are an optional comma separated list of values to show as a drop down."));
+ addAttribute("(optional) value list:", vl);
+
+ final TextBox header = new TextBox();
+ header.setText(col.header);
+ header.addChangeListener(new ChangeListener() {
+ public void onChange(Widget w) {
+ editingCol.header = header.getText();
+ } });
+ addAttribute("Column header (description):", header);
+
+
+ Button apply = new Button("Apply changes");
+ apply.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ if (isNew) {
+ dt.actionCols.add(editingCol);
+
+ } else {
+ col.boundName = editingCol.boundName;
+ col.factField = editingCol.factField;
+ col.header = editingCol.header;
+ col.type = editingCol.type;
+ col.valueList = editingCol.valueList;
+ }
+ refreshGrid.execute();
+ hide();
+
+ }
+ });
+ addAttribute("", apply);
+
+
+ }
+
+ private TextBox getFieldLabel() {
+ final TextBox box = new TextBox();
+ box.addChangeListener(new ChangeListener() {
+ public void onChange(Widget w) {
+ editingCol.factField = box.getText();
+ }
+ });
+ return box;
+ }
+
+ private void showFieldChange() {
+ final FormStylePopup pop = new FormStylePopup();
+ pop.setModal(false);
+ final String factType = getFactType(this.editingCol.boundName);
+ String[] fields = this.sce.getFieldCompletions(factType);
+ final ListBox box = new ListBox();
+ for (int i = 0; i < fields.length; i++) {
+ box.addItem(fields[i]);
+ }
+ pop.addAttribute("Field:", box);
+ Button b = new Button("OK");
+ pop.addAttribute("", b);
+ b.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ editingCol.factField = box.getItemText(box.getSelectedIndex());
+ editingCol.type = sce.getFieldType(factType, editingCol.factField);
+ doFieldLabel();
+ pop.hide();
+ }
+ });
+ pop.show();
+
+ }
+
+ private void doFieldLabel() {
+ if (this.editingCol.factField != null) {
+ this.fieldLabel.setText(this.editingCol.factField);
+ } else {
+ this.fieldLabel.setText("(please choose a fact pattern first)");
+ }
+ }
+
+ private String getFactType(String boundName) {
+ for (Iterator iterator = dt.conditionCols.iterator(); iterator.hasNext();) {
+ ConditionCol col = (ConditionCol) iterator.next();
+ if (col.boundName.equals(boundName)) {
+ return col.factType;
+ }
+ }
+ return "";
+ }
+
+ private void showChangeFact(Widget w) {
+ final FormStylePopup pop = new FormStylePopup();
+
+ final ListBox pats = this.loadBoundFacts();
+ pop.addAttribute("Choose fact:", pats);
+ Button ok = new Button("OK");
+ pop.addAttribute("", ok);
+
+ ok.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ String val = pats.getValue(pats.getSelectedIndex());
+ editingCol.boundName = val;
+ doBindingLabel();
+ pop.hide();
+ }
+ });
+
+ pop.show();
+
+ }
+
+ private ListBox loadBoundFacts() {
+ Set facts = new HashSet();
+ for (int i = 0; i < this.dt.conditionCols.size(); i++) {
+ ConditionCol c = (ConditionCol) dt.conditionCols.get(i);
+ facts.add(c.boundName);
+ }
+
+ ListBox box = new ListBox();
+ for (Iterator iterator = facts.iterator(); iterator.hasNext();) {
+ String b = (String) iterator.next();
+ box.addItem(b);
+ }
+
+ String[] globs = this.sce.getGlobalVariables();
+ for (int i = 0; i < globs.length; i++) {
+ box.addItem(globs[i]);
+ }
+
+ return box;
+ }
+
+ private void doBindingLabel() {
+ if (this.editingCol.boundName != null) {
+ this.bindingLabel.setText("" + this.editingCol.boundName);
+ } else {
+ this.bindingLabel.setText("(please choose a bound fact for this column)");
+ }
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/DecisionTableXLSWidget.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/decisiontable/DecisionTableXLSWidget.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/DecisionTableXLSWidget.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/DecisionTableXLSWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,50 @@
+package org.drools.guvnor.client.decisiontable;
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.ruleeditor.RuleViewer;
+
+import com.google.gwt.user.client.ui.HTML;
+
+/**
+ * This widget deals with XLS files in "classic" decision tables.
+ *
+ * @author Michael Neale
+ */
+public class DecisionTableXLSWidget extends AssetAttachmentFileWidget {
+
+ public DecisionTableXLSWidget(
+ RuleAsset asset, RuleViewer viewer) {
+ super( asset,
+ viewer );
+ super.addDescription(new HTML("<small><i>This is a decision table in a spreadsheet (XLS). Typically they contain many rules in one sheet.</i></small>"));
+ }
+
+ public String getIcon() {
+ return "images/decision_table.png";
+ }
+
+ public String getOverallStyleName() {
+ return "decision-Table-upload";
+ }
+
+
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/decisiontable/GuidedDTColumnConfig.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,379 @@
+package org.drools.guvnor.client.decisiontable;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.InfoPopup;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.HumanReadable;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
+
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.RadioButton;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
+
+/**
+ * This is a configuration editor for a column in a the guided decision table.
+ * @author Michael Neale
+ *
+ */
+public class GuidedDTColumnConfig extends FormStylePopup {
+
+ private GuidedDecisionTable dt;
+ private SuggestionCompletionEngine sce;
+ private ConditionCol editingCol;
+ private SmallLabel patternLabel = new SmallLabel();
+ private TextBox fieldLabel = getFieldLabel();
+ private SmallLabel operatorLabel = new SmallLabel();
+
+ /**
+ * Pass in a null col and it will create a new one.
+ */
+ public GuidedDTColumnConfig(SuggestionCompletionEngine sce, final GuidedDecisionTable dt, final Command refreshGrid, final ConditionCol col, final boolean isNew) {
+ super();
+ this.setModal(false);
+ this.dt = dt;
+ this.sce = sce;
+ this.editingCol = new ConditionCol();
+ editingCol.boundName = col.boundName;
+ editingCol.constraintValueType = col.constraintValueType;
+ editingCol.factField = col.factField;
+ editingCol.factType = col.factType;
+ editingCol.header = col.header;
+ editingCol.operator = col.operator;
+ editingCol.valueList = col.valueList;
+
+
+ setTitle("Condition column configuration");
+
+
+
+ HorizontalPanel pattern = new HorizontalPanel();
+ pattern.add(patternLabel);
+ doPatternLabel();
+
+ Image changePattern = new ImageButton("images/edit.gif", "Choose an existing pattern that this column adds to", new ClickListener() {
+ public void onClick(Widget w) {
+ showChangePattern(w);
+ }
+ });
+ pattern.add(changePattern);
+
+
+ addAttribute("Pattern:", pattern);
+
+ //now a radio button with the type
+ RadioButton literal = new RadioButton("constraintValueType", "Literal value");
+ RadioButton formula = new RadioButton("constraintValueType", "Formula");
+ RadioButton predicate = new RadioButton("constraintValueType", "Predicate");
+
+
+ HorizontalPanel valueTypes = new HorizontalPanel();
+ valueTypes.add(literal);
+ valueTypes.add(formula);
+ valueTypes.add(predicate);
+ addAttribute("Calculation type:", valueTypes);
+
+ switch (editingCol.constraintValueType) {
+ case ISingleFieldConstraint.TYPE_LITERAL:
+ literal.setChecked(true);
+ break;
+ case ISingleFieldConstraint.TYPE_RET_VALUE :
+ formula.setChecked(true);
+ break;
+ case ISingleFieldConstraint.TYPE_PREDICATE :
+ predicate.setChecked(true);
+ }
+
+ literal.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ applyConsTypeChange(ISingleFieldConstraint.TYPE_LITERAL);
+ }
+ });
+
+
+ formula.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ applyConsTypeChange(ISingleFieldConstraint.TYPE_RET_VALUE);
+ }
+ });
+ predicate.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ applyConsTypeChange(ISingleFieldConstraint.TYPE_PREDICATE);
+ }
+ });
+
+
+ HorizontalPanel field = new HorizontalPanel();
+ field.add(fieldLabel);
+ Image editField = new ImageButton("images/edit.gif", "Edit the field that this column operates on", new ClickListener() {
+ public void onClick(Widget w) {
+ showFieldChange();
+ }
+ });
+ field.add(editField);
+ addAttribute("Field:", field);
+ doFieldLabel();
+
+
+ HorizontalPanel operator = new HorizontalPanel();
+ operator.add(operatorLabel);
+ Image editOp = new ImageButton("images/edit.gif", "Edit the operator that is used to compare data with this field", new ClickListener() {
+ public void onClick(Widget w) {
+ showOperatorChange();
+ }
+ });
+ operator.add(editOp);
+ addAttribute("Operator:", operator);
+ doOperatorLabel();
+
+ final TextBox valueList = new TextBox();
+ valueList.setText(editingCol.valueList);
+ valueList.addChangeListener(new ChangeListener() {
+ public void onChange(Widget w) {
+ editingCol.valueList = valueList.getText();
+ }
+ });
+ HorizontalPanel vl = new HorizontalPanel();
+ vl.add(valueList);
+ vl.add(new InfoPopup("Value list", "Value lists are an optional comma separated list of values to show as a drop down."));
+ addAttribute("(optional) value list:", vl);
+
+ final TextBox header = new TextBox();
+ header.setText(col.header);
+ header.addChangeListener(new ChangeListener() {
+ public void onChange(Widget w) {
+ editingCol.header = header.getText();
+ } });
+ addAttribute("Column header (description):", header);
+
+
+ Button apply = new Button("Apply changes");
+ apply.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ if (isNew) {
+ dt.conditionCols.add(editingCol);
+ } else {
+ col.boundName = editingCol.boundName;
+ col.constraintValueType = editingCol.constraintValueType;
+ col.factField = editingCol.factField;
+ col.factType = editingCol.factType;
+ col.header = editingCol.header;
+ col.operator = editingCol.operator;
+ col.valueList = editingCol.valueList;
+ }
+ refreshGrid.execute();
+ hide();
+
+ }
+ });
+ addAttribute("", apply);
+
+
+
+
+
+ }
+
+ private TextBox getFieldLabel() {
+ final TextBox box = new TextBox();
+ box.addChangeListener(new ChangeListener() {
+ public void onChange(Widget w) {
+ editingCol.factField = box.getText();
+ }
+ });
+ return box;
+ }
+
+ private void applyConsTypeChange(int newType) {
+ editingCol.constraintValueType = newType;
+ doFieldLabel();
+ doOperatorLabel();
+ }
+
+
+ private void doOperatorLabel() {
+ if (editingCol.constraintValueType == ISingleFieldConstraint.TYPE_PREDICATE) {
+ operatorLabel.setText("(not needed for predicate)");
+ } else if (nil(editingCol.factType)) {
+ operatorLabel.setText("(please select a pattern first)");
+ } else if (nil(editingCol.factField)) {
+ operatorLabel.setText("(please choose a field first)");
+ } else if (nil(editingCol.operator)) {
+ operatorLabel.setText("(please select a field)");
+ } else {
+ operatorLabel.setText(HumanReadable.getOperatorDisplayName(editingCol.operator));
+ }
+ }
+
+ private void showOperatorChange() {
+ final FormStylePopup pop = new FormStylePopup();
+ pop.setTitle("Set the operator");
+ pop.setModal(false);
+ String[] ops = this.sce.getOperatorCompletions(editingCol.factType, editingCol.factField);
+ final ListBox box = new ListBox();
+ for (int i = 0; i < ops.length; i++) {
+ box.addItem(HumanReadable.getOperatorDisplayName(ops[i]), ops[i]);
+ }
+ box.addItem("(no operator)", "");
+ pop.addAttribute("Operator:", box);
+ Button b = new Button("OK");
+ pop.addAttribute("", b);
+ b.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ editingCol.operator = box.getValue(box.getSelectedIndex());
+ doOperatorLabel();
+ pop.hide();
+ }
+ });
+ pop.show();
+
+ }
+
+ private void doFieldLabel() {
+ if (editingCol.constraintValueType == ISingleFieldConstraint.TYPE_PREDICATE) {
+ fieldLabel.setText("(not needed for predicate)");
+ } else if (nil(editingCol.factType)) {
+ fieldLabel.setText("(please select a pattern first)");
+ }
+ else if (nil(editingCol.factField)) {
+ fieldLabel.setText("(please select a field)");
+ } else {
+ fieldLabel.setText(this.editingCol.factField);
+ }
+ }
+
+ private boolean nil(String s) {
+ return s == null || s.equals("");
+ }
+
+ protected void showFieldChange() {
+ final FormStylePopup pop = new FormStylePopup();
+ pop.setModal(false);
+ String[] fields = this.sce.getFieldCompletions(this.editingCol.factType);
+ final ListBox box = new ListBox();
+ for (int i = 0; i < fields.length; i++) {
+ box.addItem(fields[i]);
+ }
+ pop.addAttribute("Field:", box);
+ Button b = new Button("OK");
+ pop.addAttribute("", b);
+ b.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ editingCol.factField = box.getItemText(box.getSelectedIndex());
+ doFieldLabel();
+ doOperatorLabel();
+ pop.hide();
+ }
+ });
+ pop.show();
+ }
+
+ private void doPatternLabel() {
+ if (this.editingCol.factType != null) {
+ this.patternLabel.setText(this.editingCol.factType + " [" + editingCol.boundName + "]");
+ }
+ doFieldLabel();
+ doOperatorLabel();
+
+ }
+
+ protected void showChangePattern(Widget w) {
+
+ final ListBox pats = this.loadPatterns();
+ if (pats.getItemCount() == 0) {
+ showNewPatternDialog();
+ return;
+ }
+ final FormStylePopup pop = new FormStylePopup();
+ Button ok = new Button("OK");
+ HorizontalPanel hp = new HorizontalPanel();
+ hp.add(pats);
+ hp.add(ok);
+
+
+ pop.addAttribute("Choose existing pattern to add column to:", hp);
+ pop.addAttribute("", new HTML("<i><b>---OR---</i></b>"));
+
+ Button createPattern = new Button("Create new fact pattern");
+ createPattern.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ pop.hide();
+ showNewPatternDialog();
+ }
+ });
+ pop.addAttribute("", createPattern);
+
+
+
+
+ ok.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ String[] val = pats.getValue(pats.getSelectedIndex()).split("\\s");
+ editingCol.factType = val[0];
+ editingCol.boundName = val[1];
+ doPatternLabel();
+ pop.hide();
+ }
+ });
+
+ pop.show();
+ }
+
+ protected void showNewPatternDialog() {
+ final FormStylePopup pop = new FormStylePopup();
+ pop.setTitle("Create a new fact pattern");
+ final ListBox types = new ListBox();
+ for (int i = 0; i < sce.factTypes.length; i++) {
+ types.addItem(sce.factTypes[i]);
+ }
+ pop.addAttribute("Fact type:", types);
+ final TextBox binding = new TextBox();
+ pop.addAttribute("name:", binding);
+
+ Button ok = new Button("OK");
+ ok.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ editingCol.boundName = binding.getText();
+ editingCol.factType = types.getItemText(types.getSelectedIndex());
+ doPatternLabel();
+ pop.hide();
+ }
+ });
+ pop.addAttribute("", ok);
+
+ pop.show();
+
+ }
+
+ private ListBox loadPatterns() {
+ Set vars = new HashSet();
+ ListBox patterns = new ListBox();
+ for (int i = 0; i < dt.conditionCols.size(); i++) {
+ ConditionCol c = (ConditionCol) dt.conditionCols.get(i);
+ if (!vars.contains(c.boundName)) {
+ patterns.addItem(c.factType + " [" + c.boundName + "]", c.factType + " " + c.boundName);
+ vars.add(c.boundName);
+ }
+ }
+
+ return patterns;
+
+ }
+
+
+
+}
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/decisiontable/GuidedDecisionTableWidget.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,917 @@
+package org.drools.guvnor.client.decisiontable;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.dt.ActionCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionInsertFactCol;
+import org.drools.guvnor.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.guvnor.client.modeldriven.dt.AttributeCol;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.DTColumnConfig;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.client.modeldriven.ui.ActionValueEditor;
+import org.drools.guvnor.client.packages.SuggestionCompletionCache;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.ruleeditor.SaveEventListener;
+
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.KeyboardListener;
+import com.google.gwt.user.client.ui.KeyboardListenerAdapter;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
+import com.gwtext.client.core.EventObject;
+import com.gwtext.client.core.SortDir;
+import com.gwtext.client.data.ArrayReader;
+import com.gwtext.client.data.FieldDef;
+import com.gwtext.client.data.GroupingStore;
+import com.gwtext.client.data.MemoryProxy;
+import com.gwtext.client.data.Record;
+import com.gwtext.client.data.RecordDef;
+import com.gwtext.client.data.SortState;
+import com.gwtext.client.data.Store;
+import com.gwtext.client.data.StringFieldDef;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.Toolbar;
+import com.gwtext.client.widgets.ToolbarMenuButton;
+import com.gwtext.client.widgets.Window;
+import com.gwtext.client.widgets.form.FieldSet;
+import com.gwtext.client.widgets.form.FormPanel;
+import com.gwtext.client.widgets.grid.BaseColumnConfig;
+import com.gwtext.client.widgets.grid.CellMetadata;
+import com.gwtext.client.widgets.grid.ColumnConfig;
+import com.gwtext.client.widgets.grid.ColumnModel;
+import com.gwtext.client.widgets.grid.GridPanel;
+import com.gwtext.client.widgets.grid.GroupingView;
+import com.gwtext.client.widgets.grid.Renderer;
+import com.gwtext.client.widgets.grid.event.GridCellListenerAdapter;
+import com.gwtext.client.widgets.grid.event.GridColumnListenerAdapter;
+import com.gwtext.client.widgets.menu.BaseItem;
+import com.gwtext.client.widgets.menu.Item;
+import com.gwtext.client.widgets.menu.Menu;
+import com.gwtext.client.widgets.menu.event.BaseItemListenerAdapter;
+
+/**
+ * This is the new guided decision table editor for the web.
+ * @author Michael Neale
+ */
+public class GuidedDecisionTableWidget extends Composite implements SaveEventListener {
+
+ private GuidedDecisionTable dt;
+ private VerticalPanel layout;
+ private GridPanel grid;
+ private FieldDef[] fds;
+ private VerticalPanel attributeConfigWidget;
+ private VerticalPanel conditionsConfigWidget;
+ private String packageName;
+ private VerticalPanel actionsConfigWidget;
+ private Map colMap;
+ private SuggestionCompletionEngine sce;
+ private GroupingStore store;
+
+
+ public GuidedDecisionTableWidget(RuleAsset asset) {
+
+
+ this.dt = (GuidedDecisionTable) asset.content;
+ this.packageName = asset.metaData.packageName;
+ this.dt.tableName = asset.metaData.name;
+
+
+ layout = new VerticalPanel();
+
+ FormPanel config = new FormPanel();
+ config.setTitle("Decision table");
+
+ config.setBodyBorder(false);
+ config.setCollapsed(true);
+ config.setCollapsible(true);
+
+
+ FieldSet attributes = new FieldSet("Attribute columns");
+ attributes.setCollapsible(true);
+
+ attributes.setFrame(true);
+ attributes.add(getAttributes());
+ attributes.setCollapsed(dt.attributeCols.size() == 0);
+ config.add(attributes);
+
+
+ FieldSet conditions = new FieldSet("Condition columns");
+ conditions.setCollapsible(true);
+ conditions.add(getConditions());
+ config.add(conditions);
+
+
+ FieldSet actions = new FieldSet("Action columns");
+ actions.setCollapsible(true);
+ actions.add(getActions());
+ config.add(actions);
+
+ FieldSet grouping = new FieldSet("(options)");
+ grouping.setCollapsible(true);
+ grouping.setCollapsed(true);
+ grouping.add(getGrouping());
+ config.add(grouping);
+
+
+ layout.add(config);
+
+ refreshGrid();
+
+
+ initWidget(layout);
+ }
+
+ private Widget getGrouping() {
+ final ListBox list = new ListBox();
+
+ list.addItem("Description", "desc");
+ for (Iterator iterator = dt.attributeCols.iterator(); iterator.hasNext();) {
+ AttributeCol c = (AttributeCol) iterator.next();
+ list.addItem(c.attr, c.attr);
+ if (c.attr.equals(dt.groupField)) {
+ list.setSelectedIndex(list.getItemCount() - 1);
+ }
+ }
+ for (Iterator iterator = dt.conditionCols.iterator(); iterator.hasNext();) {
+ ConditionCol c = (ConditionCol) iterator.next();
+ list.addItem(c.header, c.header);
+ if (c.header.equals(dt.groupField)) {
+ list.setSelectedIndex(list.getItemCount() - 1);
+ }
+ }
+ for (Iterator iterator = dt.actionCols.iterator(); iterator.hasNext();) {
+ ActionCol c = (ActionCol) iterator.next();
+ list.addItem(c.header, c.header);
+ if (c.header.equals(dt.groupField)) {
+ list.setSelectedIndex(list.getItemCount() - 1);
+ }
+ }
+
+ list.addItem("-- none --", "");
+ if (dt.groupField == null) {
+ list.setSelectedIndex(list.getItemCount() - 1);
+ }
+
+ HorizontalPanel h = new HorizontalPanel();
+ h.add(new SmallLabel("Group by column: "));
+ h.add(list);
+
+ Button ok = new Button("Apply");
+ ok.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ dt.groupField = list.getValue(list.getSelectedIndex());
+ scrapeData(-1);
+ refreshGrid();
+ }
+ });
+
+ h.add(ok);
+
+ return h;
+ }
+
+ private Widget getActions() {
+ actionsConfigWidget = new VerticalPanel();
+ refreshActionsWidget();
+ return actionsConfigWidget;
+ }
+
+ private void refreshActionsWidget() {
+ this.actionsConfigWidget.clear();
+ for (int i = 0; i < dt.actionCols.size(); i++) {
+ ActionCol c = (ActionCol) dt.actionCols.get(i);
+ HorizontalPanel hp = new HorizontalPanel();
+ hp.add(removeAction(c));
+ hp.add(editAction(c));
+ hp.add(new SmallLabel(c.header));
+ actionsConfigWidget.add(hp);
+ }
+ actionsConfigWidget.add(newAction());
+
+ }
+
+ private Widget editAction(final ActionCol c) {
+ return new ImageButton("images/edit.gif", "Edit this action column configuration", new ClickListener() {
+ public void onClick(Widget w) {
+ if (c instanceof ActionSetFieldCol) {
+ ActionSetFieldCol asf = (ActionSetFieldCol) c;
+ ActionSetColumn ed = new ActionSetColumn(getSCE(), dt, new Command() {
+ public void execute() {
+ scrapeData(-1);
+ refreshGrid();
+ refreshActionsWidget();
+ }
+ }
+ , asf, false);
+ ed.show();
+ } else if (c instanceof ActionInsertFactCol) {
+ ActionInsertFactCol asf = (ActionInsertFactCol) c;
+ ActionInsertColumn ed = new ActionInsertColumn(getSCE(), dt, new Command() {
+ public void execute() {
+ scrapeData(-1);
+ refreshGrid();
+ refreshActionsWidget();
+ }
+ }
+ , asf, false);
+ ed.show();
+ }
+
+ }
+ });
+
+ }
+
+ private Widget newAction() {
+ return new ImageButton( "images/new_item.gif", "Create a new action column", new ClickListener() {
+ public void onClick(Widget w) {
+ final FormStylePopup pop = new FormStylePopup();
+ pop.setModal(false);
+
+ final ListBox choice = new ListBox();
+ choice.addItem("Set the value of a field", "set");
+ choice.addItem("Set the value of a field on a new fact", "insert");
+ Button ok = new Button("OK");
+ ok.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+ String s = choice.getValue(choice.getSelectedIndex());
+ if (s.equals("set")) {
+ showSet();
+ } else if (s.equals("insert")) {
+ showInsert();
+ }
+ pop.hide();
+ }
+
+ private void showInsert() {
+ ActionInsertColumn ins = new ActionInsertColumn(getSCE(), dt, new Command() {
+ public void execute() { newActionAdded(); }
+ }, new ActionInsertFactCol(), true);
+ ins.show();
+ }
+
+ private void showSet() {
+ ActionSetColumn set = new ActionSetColumn(getSCE(), dt, new Command() {
+ public void execute() { newActionAdded(); }
+ }, new ActionSetFieldCol(), true);
+ set.show();
+ }
+
+ private void newActionAdded() {
+ //want to add in a blank row into the data
+ scrapeData(dt.attributeCols.size() + dt.conditionCols.size() + dt.actionCols.size() + 1);
+ refreshGrid();
+ refreshActionsWidget();
+
+ }
+ });
+ pop.addAttribute("Type of action column:", choice);
+ pop.addAttribute("", ok);
+ pop.show();
+ }
+
+ });
+
+
+ }
+
+ private Widget removeAction(final ActionCol c) {
+ Image del = new ImageButton("images/delete_item_small.gif", "Remove this action column", new ClickListener() {
+ public void onClick(Widget w) {
+ if (com.google.gwt.user.client.Window.confirm("Are you sure you want to delete the column for " + c.header + " - all data in that column will be removed?")) {
+ dt.actionCols.remove(c);
+ removeField(c.header);
+ scrapeData(-1);
+ refreshGrid();
+ refreshActionsWidget();
+ }
+ }
+ });
+
+ return del;
+ }
+
+ private Widget getConditions() {
+ conditionsConfigWidget = new VerticalPanel();
+ refreshConditionsWidget();
+ return conditionsConfigWidget;
+ }
+
+ private void refreshConditionsWidget() {
+ this.conditionsConfigWidget.clear();
+ for (int i = 0; i < dt.conditionCols.size(); i++) {
+ ConditionCol c = (ConditionCol) dt.conditionCols.get(i);
+ HorizontalPanel hp = new HorizontalPanel();
+ hp.add(removeCondition(c));
+ hp.add(editCondition(c));
+ hp.add(new SmallLabel(c.header));
+ conditionsConfigWidget.add(hp);
+ }
+ conditionsConfigWidget.add(newCondition());
+
+
+
+ }
+
+ private Widget newCondition() {
+ final ConditionCol newCol = new ConditionCol();
+ newCol.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
+ return new ImageButton("images/new_item.gif", "Add a new condition column", new ClickListener() {
+ public void onClick(Widget w) {
+ GuidedDTColumnConfig dialog = new GuidedDTColumnConfig(getSCE(), dt, new Command() {
+ public void execute() {
+ //want to add in a blank row into the data
+ scrapeData(dt.attributeCols.size() + dt.conditionCols.size() + 1);
+ refreshGrid();
+ refreshConditionsWidget();
+ }
+ }, newCol, true);
+ dialog.show();
+ }
+ });
+ }
+
+ private Widget editCondition(final ConditionCol c) {
+ return new ImageButton("images/edit.gif", "Edit this columns configuration", new ClickListener() {
+ public void onClick(Widget w) {
+ GuidedDTColumnConfig dialog = new GuidedDTColumnConfig(getSCE(), dt, new Command() {
+ public void execute() {
+ scrapeData(-1);
+ refreshGrid();
+ refreshConditionsWidget();
+ }
+ }, c, false);
+ dialog.show();
+ }
+ });
+ }
+
+ private SuggestionCompletionEngine getSCE() {
+ if (sce == null) {
+ this.sce = SuggestionCompletionCache.getInstance().getEngineFromCache(this.packageName);
+ }
+ return sce;
+ }
+
+ private Widget removeCondition(final ConditionCol c) {
+ Image del = new ImageButton("images/delete_item_small.gif", "Remove this condition column", new ClickListener() {
+ public void onClick(Widget w) {
+ if (com.google.gwt.user.client.Window.confirm("Are you sure you want to delete the column for " + c.header + " - all data in that column will be removed?")) {
+ dt.conditionCols.remove(c);
+ removeField(c.header);
+ scrapeData(-1);
+ refreshGrid();
+ refreshConditionsWidget();
+ }
+ }
+ });
+
+ return del;
+ }
+
+ private Widget getAttributes() {
+ attributeConfigWidget = new VerticalPanel();
+ refreshAttributeWidget();
+ return attributeConfigWidget;
+ }
+
+ private void refreshAttributeWidget() {
+ this.attributeConfigWidget.clear();
+ for (int i = 0; i < dt.attributeCols.size(); i++) {
+ AttributeCol at = (AttributeCol) dt.attributeCols.get(i);
+ HorizontalPanel hp = new HorizontalPanel();
+ hp.add(removeAttr(at));
+ hp.add(new SmallLabel(at.attr));
+ attributeConfigWidget.add(hp);
+ }
+ attributeConfigWidget.add(newAttr());
+ }
+
+ private Widget newAttr() {
+ ImageButton but = new ImageButton("images/new_item.gif", "Add a new attribute.", new ClickListener() {
+ public void onClick(Widget w) {
+ //show choice of attributes
+ final FormStylePopup pop = new FormStylePopup();
+ final ListBox list = new ListBox();
+ list.addItem( "Choose..." );
+
+
+ addItem( "salience",list);
+ addItem( "enabled", list );
+ addItem( "date-effective", list );
+ addItem( "date-expires", list );
+ addItem( "no-loop", list );
+ addItem( "agenda-group", list );
+ addItem( "activation-group", list );
+ addItem( "duration", list );
+ addItem( "auto-focus", list );
+ addItem( "lock-on-active", list );
+ addItem( "ruleflow-group", list );
+
+ pop.addAttribute("New attribute:", list);
+
+ Button ok = new Button("Add");
+ ok.addClickListener(new ClickListener() {
+ public void onClick(Widget w) {
+
+ AttributeCol attr = new AttributeCol();
+ attr.attr = list.getItemText(list.getSelectedIndex());
+ if (attr.attr.equals("Choose...")) {
+ com.google.gwt.user.client.Window.alert("Please pick a valid attribute");
+ return;
+ }
+ dt.attributeCols.add(attr);
+ scrapeData(dt.attributeCols.size() + 1);
+ refreshGrid();
+ refreshAttributeWidget();
+ pop.hide();
+ }
+ });
+
+ pop.addAttribute("", ok);
+ pop.show();
+ }
+
+ private void addItem(String at, final ListBox list) {
+ if (!hasAttribute(at, dt.attributeCols)) list.addItem( at );
+ }
+
+ private boolean hasAttribute(String at, List attributeCols) {
+ for (Iterator iterator = attributeCols.iterator(); iterator
+ .hasNext();) {
+ AttributeCol c = (AttributeCol) iterator.next();
+ if (c.attr.equals(at)) {
+ return true;
+ }
+ }
+ return false;
+ }
+ });
+ return but;
+ }
+
+ private Widget removeAttr(final AttributeCol at) {
+ Image del = new ImageButton("images/delete_item_small.gif", "Remove this attribute", new ClickListener() {
+ public void onClick(Widget w) {
+ if (com.google.gwt.user.client.Window.confirm("Are you sure you want to delete the column for " + at.attr + " - all data in that column will be removed?")) {
+ dt.attributeCols.remove(at);
+ removeField(at.attr);
+ scrapeData(-1);
+ refreshGrid();
+ refreshAttributeWidget();
+ }
+ }
+ });
+
+ return del;
+ }
+
+ /**
+ * Here we read the record data from the grid into the data in the model.
+ * if we have an insertCol - then a new empty column of data will be added in that
+ * row position.
+ */
+ private void scrapeData(int insertCol) {
+ Record[] recs = grid.getStore().getRecords();
+ dt.data = new String[recs.length][];
+ for (int i = 0; i < recs.length; i++) {
+ Record r = recs[i];
+ if (insertCol == -1) {
+ String[] row = new String[fds.length];
+ dt.data[i] = row;
+ for (int j = 0; j < fds.length; j++) {
+ row[j] = r.getAsString(fds[j].getName());
+ }
+ } else {
+ String[] row = new String[fds.length + 1];
+ dt.data[i] = row;
+ for (int j = 0; j < fds.length; j++) {
+ if (j < insertCol) {
+ row[j] = r.getAsString(fds[j].getName());
+ } else if (j >= insertCol) {
+ row[j + 1] = r.getAsString(fds[j].getName());
+ }
+ }
+ }
+ }
+// String groupF = store.getGroupField();
+// if (groupF == null || groupF.equals("")) {
+// dt.groupField = groupF;
+// }
+ }
+
+ /**
+ * removes the field from the field def.
+ * @param headerName
+ */
+ private void removeField(String headerName) {
+ FieldDef[] fds_ = new FieldDef[fds.length -1];
+ int new_i = 0;
+ for (int i = 0; i < fds.length; i++) {
+ FieldDef fd = fds[i];
+ if (!fd.getName().equals(headerName)) {
+ fds_[new_i] = fd;
+ new_i++;
+ }
+ }
+ this.fds = fds_;
+
+ }
+
+
+ private void refreshGrid() {
+ if (layout.getWidgetCount() > 1) {
+ layout.remove(1);
+ }
+ if (dt.actionCols.size() == 0 && dt.conditionCols.size() == 0 && dt.actionCols.size() == 0) {
+ VerticalPanel vp = new VerticalPanel();
+ vp.setWidth("100%");
+ PrettyFormLayout pfl = new PrettyFormLayout();
+ pfl.startSection();
+ pfl.addRow(new HTML("<img src='images/information.gif'/> Configure the columns first, then add rows (rules)." +
+ " A fact model (in the current package) will be needed to provide the facts and fields to configure this decision table."));
+
+ pfl.endSection();
+ vp.add(pfl);
+ grid = doGrid();
+ vp.add(grid);
+ layout.add(vp);
+
+ } else {
+ grid = doGrid();
+ layout.add(grid);
+ }
+ }
+
+ private GridPanel doGrid() {
+
+ fds = new FieldDef[dt.attributeCols.size() + dt.actionCols.size() + dt.conditionCols.size() + 2]; //its +2 as we have counter and description data
+
+ colMap = new HashMap();
+
+ fds[0] = new StringFieldDef("num");
+ fds[1] = new StringFieldDef("desc");
+
+ int colCount = 0;
+
+ BaseColumnConfig[] cols = new BaseColumnConfig[fds.length + 1]; //its +1 as we have the separator -> thing.
+ cols[0] = new ColumnConfig() {
+ {
+ setDataIndex("num");
+ setWidth(20);
+ setSortable(true);
+ setRenderer(new Renderer() {
+ public String render(Object value,
+ CellMetadata cellMetadata, Record record,
+ int rowIndex, int colNum, Store store) {
+ return "<span class='x-grid3-cell-inner x-grid3-td-numberer'>" + value + "</span>";
+ }
+ });
+ }
+ };
+ colCount++;
+ cols[1] = new ColumnConfig() {
+ {
+ setDataIndex("desc");
+ setSortable(true);
+ setHeader("Description");
+ if (dt.descriptionWidth != -1) {
+ setWidth(dt.descriptionWidth);
+ }
+ }
+ };
+ colCount++;
+
+
+ //now to attributes
+ for (int i = 0; i < dt.attributeCols.size(); i++) {
+ final AttributeCol attr = (AttributeCol) dt.attributeCols.get(i);
+ fds[colCount] = new StringFieldDef(attr.attr);
+ cols[colCount] = new ColumnConfig() {
+ {
+ setHeader(attr.attr);
+ setDataIndex(attr.attr);
+ setSortable(true);
+ if (attr.width != -1) {
+ setWidth(attr.width);
+ }
+
+ }
+ };
+ colMap.put(attr.attr, attr);
+ colCount++;
+ }
+
+
+ //do all the condition cols
+ for (int i = 0; i < dt.conditionCols.size(); i++) {
+ //here we could also deal with numeric type?
+ final ConditionCol c = (ConditionCol) dt.conditionCols.get(i);
+ fds[colCount] = new StringFieldDef(c.header);
+ cols[colCount] = new ColumnConfig() {
+ {
+ setHeader(c.header);
+ setDataIndex(c.header);
+ setSortable(true);
+ if (c.width != -1) {
+ setWidth(c.width);
+ }
+ }
+ };
+ colMap.put(c.header, c);
+ colCount++;
+ }
+
+ //the split thing
+ cols[colCount] = new ColumnConfig() {
+ {
+ setDataIndex("x");
+ setHeader("");
+ setFixed(true);
+ setResizable(false);
+
+ setRenderer(new Renderer() {
+ public String render(Object value,
+ CellMetadata cellMetadata, Record record,
+ int rowIndex, int colNum, Store store) {
+ return "<b>→</b>";
+ }
+ });
+ setWidth(20);
+ }
+ };
+ colCount++;
+
+ for (int i = 0; i < dt.actionCols.size(); i++) {
+ //here we could also deal with numeric type?
+ final ActionCol c = (ActionCol) dt.actionCols.get(i);
+ fds[colCount-1] = new StringFieldDef(c.header);
+
+ cols[colCount] = new ColumnConfig() {
+ {
+ setHeader(c.header);
+ setDataIndex(c.header);
+ //and here we do the appropriate editor
+ setSortable(true);
+ if (c.width != -1) {
+ setWidth(-1);
+ }
+ }
+ };
+ colMap.put(c.header, c);
+ colCount++;
+ }
+
+ final RecordDef recordDef = new RecordDef(fds);
+ ArrayReader reader = new ArrayReader(recordDef);
+ MemoryProxy proxy = new MemoryProxy( dt.data );
+
+
+ ColumnModel cm = new ColumnModel(cols);
+ store = new GroupingStore();
+ store.setReader(reader);
+ store.setDataProxy(proxy);
+ store.setSortInfo(new SortState("num", SortDir.ASC));
+ if (this.dt.groupField != null) {
+ store.setGroupField(dt.groupField);
+ }
+
+ store.load();
+
+
+ final GridPanel grid = new GridPanel(store, cm);
+ grid.setStripeRows(true);
+
+ GroupingView gv = new GroupingView();
+
+ //to stretch it out
+ gv.setForceFit(true);
+ gv.setGroupTextTpl("{text} ({[values.rs.length]} {[values.rs.length > 1 ? \"Items\" : \"Item\"]})");
+
+
+ grid.setView(gv);
+
+
+ grid.setStore(store);
+ grid.setWidth(900);
+ grid.setHeight(500);
+
+
+
+ grid.addGridCellListener(new GridCellListenerAdapter() {
+ public void onCellDblClick(GridPanel grid, int rowIndex,
+ int colIndex, EventObject e) {
+
+ final String dataIdx = grid.getColumnModel().getDataIndex(colIndex);
+ final Record r = store.getAt(rowIndex);
+ String val = r.getAsString(dataIdx);
+ DTColumnConfig colConf = (DTColumnConfig) colMap.get(dataIdx);
+ String[] vals = dt.getValueList(colConf, getSCE());
+ if (vals.length == 0) {
+ showTextEditor(e, dataIdx, r, val, colConf);
+ } else {
+ showDropDownEditor(e, dataIdx, r, val, vals);
+ }
+
+ //box.setFocus(true);
+
+
+ }
+
+
+ });
+
+ //remember any size changes
+ grid.addGridColumnListener(new GridColumnListenerAdapter() {
+ public void onColumnResize(GridPanel grid, int colIndex, int newSize) {
+ final String dta = grid.getColumnModel().getDataIndex(colIndex);
+ if (dta.equals("desc")) {
+ dt.descriptionWidth = newSize;
+ } else {
+ if (colMap.containsKey(dta)) {
+ DTColumnConfig col = (DTColumnConfig) colMap.get(dta);
+ col.width = newSize;
+ }
+ }
+ }
+ });
+
+ Toolbar tb = new Toolbar();
+ Menu menu = new Menu();
+ menu.addItem(new Item("Add row...", new BaseItemListenerAdapter() {
+ public void onClick(BaseItem item, EventObject e) {
+ Record r = recordDef.createRecord(new Object[recordDef.getFields().length]);
+ r.set("num", store.getRecords().length + 1);
+
+ store.add(r);
+ }
+ }));
+ menu.addItem(new Item("Remove selected row(s)...", new BaseItemListenerAdapter() {
+ public void onClick(BaseItem item, EventObject e) {
+ Record[] selected = grid.getSelectionModel().getSelections();
+ if (com.google.gwt.user.client.Window.confirm("Are you sure you want to delete the selected row(s)? ")) {
+ for (int i = 0; i < selected.length; i++) {
+ store.remove(selected[i]);
+ }
+ renumber(store.getRecords());
+ }
+ }
+ }));
+ menu.addItem(new Item("Copy selected row(s)...", new BaseItemListenerAdapter() {
+ public void onClick(BaseItem item, EventObject e) {
+ Record[] selected = grid.getSelectionModel().getSelections();
+ for (int i = 0; i < selected.length; i++) {
+ Record r = recordDef.createRecord(new Object[recordDef.getFields().length]);
+ Record orig = selected[i];
+ for (int j = 0; j < fds.length; j++) {
+ r.set(fds[j].getName(), orig.getAsString(fds[j].getName()));
+ }
+ store.add(r);
+ }
+ renumber(store.getRecords());
+ }
+ }));
+ ToolbarMenuButton tbb = new ToolbarMenuButton("Modify...", menu);
+
+ tb.addButton(tbb);
+ grid.add(tb);
+
+
+
+ return grid;
+
+ }
+
+
+
+ /**
+ * Show a drop down editor, obviously.
+ */
+
+ private void showDropDownEditor(EventObject e, final String dataIdx, final Record r, String val, String[] vals) {
+ final Window w = new Window();
+ w.setWidth(200);
+ w.setPlain(true);
+ w.setBodyBorder(false);
+ w.setAutoDestroy(true);
+ w.setTitle(dataIdx);
+ final ListBox drop = new ListBox();
+ for (int i = 0; i < vals.length; i++) {
+ String v = vals[i].trim();
+ drop.addItem(v);
+ if (v.equals(val)) {
+ drop.setSelectedIndex(i);
+ }
+ }
+ drop.addKeyboardListener(new KeyboardListenerAdapter() {
+ public void onKeyUp(Widget sender, char keyCode,
+ int modifiers) {
+ if (keyCode == KeyboardListener.KEY_ENTER) {
+ r.set(dataIdx, drop.getItemText(drop.getSelectedIndex()));
+ w.destroy();
+ }
+ }
+ });
+
+
+
+
+ Panel p = new Panel();
+ p.add(drop);
+ w.add(p);
+ w.setBorder(false);
+
+ Button ok = new Button("OK");
+ ok.addClickListener(new ClickListener() {
+ public void onClick(Widget wg) {
+ r.set(dataIdx, drop.getItemText(drop.getSelectedIndex()));
+ w.destroy();
+ }
+ });
+ p.add(ok);
+
+ w.setPosition(e.getPageX(), e.getPageY());
+ w.show();
+
+ }
+
+ private void renumber(Record[] rs) {
+ for (int i = 0; i < rs.length; i++) {
+ rs[i].set("num", "" + (i + 1));
+ }
+ }
+
+
+ /**
+ * Show a plain old text editor for a cell.
+ */
+ private void showTextEditor(EventObject e, final String dta,
+ final Record r, String val, DTColumnConfig colConf) {
+ final Window w = new Window();
+ w.setWidth(200);
+ w.setAutoDestroy(true);
+ w.setPlain(true);
+ w.setBodyBorder(false);
+ w.setTitle(dta);
+ final TextBox box = new TextBox();
+ box.setText(val);
+ box.addKeyboardListener(new KeyboardListenerAdapter() {
+ public void onKeyUp(Widget sender, char keyCode,
+ int modifiers) {
+ if (keyCode == KeyboardListener.KEY_ENTER) {
+ r.set(dta, box.getText());
+ w.destroy();
+ }
+ }
+ });
+
+ if (dt.isNumeric(colConf, getSCE())) {
+ box.addKeyboardListener(ActionValueEditor.getNumericFilter(box));
+ }
+
+ Panel p = new Panel();
+ p.add(box);
+ w.add(p);
+ w.setBorder(false);
+
+ Button ok = new Button("OK");
+ ok.addClickListener(new ClickListener() {
+ public void onClick(Widget wg) {
+ r.set(dta, box.getText());
+ w.destroy();
+ }
+ });
+ p.add(ok);
+
+ w.setPosition(e.getPageX(), e.getPageY());
+ w.show();
+ }
+
+ /**
+ * Need to copy the data from the record store.
+ */
+ public void onSave() {
+ System.err.println("saving event fired !");
+ this.scrapeData(-1);
+ }
+
+
+}
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/model (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/decisiontable/model)
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/explorer)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/explorer/ExplorerLayoutManager.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,26 +1,26 @@
-package org.drools.brms.client.explorer;
+package org.drools.guvnor.client.explorer;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.drools.brms.client.LoggedInUserInfo;
-import org.drools.brms.client.admin.ArchivedAssetManager;
-import org.drools.brms.client.admin.BackupManager;
-import org.drools.brms.client.admin.CategoryManager;
-import org.drools.brms.client.admin.LogViewer;
-import org.drools.brms.client.admin.StateManager;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.packages.NewPackageWizard;
-import org.drools.brms.client.packages.SnapshotView;
-import org.drools.brms.client.rpc.PackageConfigData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.SnapshotInfo;
-import org.drools.brms.client.ruleeditor.NewAssetWizard;
-import org.drools.brms.client.rulelist.AssetItemGrid;
-import org.drools.brms.client.rulelist.AssetItemGridDataLoader;
-import org.drools.brms.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.LoggedInUserInfo;
+import org.drools.guvnor.client.admin.ArchivedAssetManager;
+import org.drools.guvnor.client.admin.BackupManager;
+import org.drools.guvnor.client.admin.CategoryManager;
+import org.drools.guvnor.client.admin.LogViewer;
+import org.drools.guvnor.client.admin.StateManager;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.packages.NewPackageWizard;
+import org.drools.guvnor.client.packages.SnapshotView;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.SnapshotInfo;
+import org.drools.guvnor.client.ruleeditor.NewAssetWizard;
+import org.drools.guvnor.client.rulelist.AssetItemGrid;
+import org.drools.guvnor.client.rulelist.AssetItemGridDataLoader;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.DockPanel;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/explorer/ExplorerNodeConfig.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,12 +1,12 @@
-package org.drools.brms.client.explorer;
+package org.drools.guvnor.client.explorer;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.qa.AnalysisView;
-import org.drools.brms.client.qa.ScenarioPackageView;
-import org.drools.brms.client.rpc.PackageConfigData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.qa.AnalysisView;
+import org.drools.guvnor.client.qa.ScenarioPackageView;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.data.Node;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/explorer/ExplorerViewCenterPanel.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,19 +1,19 @@
-package org.drools.brms.client.explorer;
+package org.drools.guvnor.client.explorer;
import java.util.HashMap;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.packages.PackageEditor2;
-import org.drools.brms.client.packages.SnapshotView;
-import org.drools.brms.client.packages.SuggestionCompletionCache;
-import org.drools.brms.client.rpc.PackageConfigData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.rpc.SnapshotInfo;
-import org.drools.brms.client.ruleeditor.RuleViewer;
-import org.drools.brms.client.rulelist.EditItemEvent;
-import org.drools.brms.client.rulelist.QuickFindWidget;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.packages.PackageEditor2;
+import org.drools.guvnor.client.packages.SnapshotView;
+import org.drools.guvnor.client.packages.SuggestionCompletionCache;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.SnapshotInfo;
+import org.drools.guvnor.client.ruleeditor.RuleViewer;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.rulelist.QuickFindWidget;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Widget;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackageHierarchy.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/explorer/PackageHierarchy.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackageHierarchy.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,9 +1,9 @@
-package org.drools.brms.client.explorer;
+package org.drools.guvnor.client.explorer;
import java.util.ArrayList;
import java.util.List;
-import org.drools.brms.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.PackageConfigData;
public class PackageHierarchy {
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/HumanReadable.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/HumanReadable.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/HumanReadable.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/HumanReadable.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,104 @@
+package org.drools.guvnor.client.modeldriven;
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This contains some simple mappings between operators, conditional elements and the human readable
+ * equivalent.
+ *
+ * Yes, I am making the presumption that programmers are not human,
+ * but I think they (we) are cool with that.
+ *
+ * @author Michael Neale
+ */
+public class HumanReadable {
+
+ public static Map operatorDisplayMap = new HashMap();
+ public static Map ceDisplayMap = new HashMap();
+ public static Map actionDisplayMap = new HashMap();
+ public static final String[] CONDITIONAL_ELEMENTS = new String[] {"not", "exists", "or"};
+
+ static {
+ operatorDisplayMap.put( "==", "is equal to" );
+ operatorDisplayMap.put( "!=", "is not equal to" );
+ operatorDisplayMap.put( "<", "is less than" );
+ operatorDisplayMap.put( "<=", "less than or equal to" );
+ operatorDisplayMap.put( ">", "greater than" );
+ operatorDisplayMap.put( ">=", "greater than or equal to" );
+
+ operatorDisplayMap.put( "|| ==", "or equal to" );
+ operatorDisplayMap.put( "|| !=", "or not equal to" );
+ operatorDisplayMap.put( "&& !=", "and not equal to" );
+ operatorDisplayMap.put( "&& >", "and greater than" );
+ operatorDisplayMap.put( "&& <", "and less than" );
+ operatorDisplayMap.put( "|| >", "or greater than" );
+ operatorDisplayMap.put( "|| <", "or less than" );
+ operatorDisplayMap.put( "&& <", "and less than" );
+
+ operatorDisplayMap.put( "|| >=", "or greater than (or equal to)" );
+ operatorDisplayMap.put( "|| <=", "or less than (or equal to)" );
+ operatorDisplayMap.put( "&& >=", "and greater than (or equal to)" );
+ operatorDisplayMap.put( "&& <=", "and less than (or equal to)" );
+ operatorDisplayMap.put( "&& contains", "and contains" );
+ operatorDisplayMap.put( "|| contains", "or contains" );
+ operatorDisplayMap.put( "&& matches", "and matches" );
+ operatorDisplayMap.put( "|| matches", "or matches" );
+ operatorDisplayMap.put( "|| excludes", "or excludes" );
+ operatorDisplayMap.put( "&& excludes", "and excludes" );
+
+ operatorDisplayMap.put( "soundslike", "sounds like" );
+
+ ceDisplayMap.put( "not", "There is no" );
+ ceDisplayMap.put( "exists", "There exists" );
+ ceDisplayMap.put( "or", "Any of" );
+
+ actionDisplayMap.put( "assert", "Insert" );
+ actionDisplayMap.put( "assertLogical", "Logically insert" );
+ actionDisplayMap.put( "retract", "Retract" );
+ actionDisplayMap.put( "set", "Set" );
+ actionDisplayMap.put( "modify", "Modify" );
+
+ }
+
+
+
+
+ public static String getOperatorDisplayName(String op) {
+ return lookup(op, operatorDisplayMap);
+ }
+
+ public static String getCEDisplayName(String ce) {
+ return lookup( ce, ceDisplayMap );
+ }
+
+ private static String lookup(String ce, Map map) {
+ if (map.containsKey(ce)) {
+ return (String) map.get(ce);
+ } else {
+ return ce;
+ }
+ }
+
+ public static String getActionDisplayName(String action) {
+ return lookup(action, actionDisplayMap);
+ }
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/brl (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/brl)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/brl/PortableObject.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/brl/PortableObject.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/brl/PortableObject.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brl;
+package org.drools.guvnor.client.modeldriven.brl;
/*
* Copyright 2005 JBoss Inc
*
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/package.html (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/package.html)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/package.html (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/package.html 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,11 @@
+<body>
+This is the model driven GUI builder.
+This also includes a DSL aware editor.
+
+The model package contains the model that drives the UI state.
+
+The SuggestionCompletionEngine provides the drop downs and suggestions etc.
+That engine would be populated based on the information from the server side (eg package info,
+imports).
+But we also need to know the bound variables.
+</body>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/ui)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/ui/ActionInsertFactWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,17 +17,17 @@
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.DirtyableFlexTable;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.modeldriven.DropDownData;
-import org.drools.brms.client.modeldriven.HumanReadable;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brl.ActionInsertLogicalFact;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.DirtyableFlexTable;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.DropDownData;
+import org.drools.guvnor.client.modeldriven.HumanReadable;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertLogicalFact;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.ChangeListener;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionRetractFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/ui/ActionRetractFactWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionRetractFactWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,10 +17,10 @@
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.modeldriven.HumanReadable;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.HumanReadable;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionRetractFact;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlexTable;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,18 +17,18 @@
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.DirtyableFlexTable;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.modeldriven.DropDownData;
-import org.drools.brms.client.modeldriven.HumanReadable;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brl.ActionSetField;
-import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.DirtyableFlexTable;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.DropDownData;
+import org.drools.guvnor.client.modeldriven.HumanReadable;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
+import org.drools.guvnor.client.modeldriven.brl.ActionUpdateField;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.ChangeListener;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionValueEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/ui/ActionValueEditor.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionValueEditor.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,14 +1,14 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.FieldEditListener;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.InfoPopup;
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.common.ValueChanged;
-import org.drools.brms.client.modeldriven.DropDownData;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.FieldEditListener;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.InfoPopup;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.common.ValueChanged;
+import org.drools.guvnor.client.modeldriven.DropDownData;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,16 +17,16 @@
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.DirtyableFlexTable;
-import org.drools.brms.client.common.DirtyableVerticalPane;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.modeldriven.HumanReadable;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.DirtyableFlexTable;
+import org.drools.guvnor.client.common.DirtyableVerticalPane;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.HumanReadable;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.ClickListener;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/ui/ConstraintValueEditor.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,21 +19,21 @@
import java.util.List;
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.FieldEditListener;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.InfoPopup;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.common.ValueChanged;
-import org.drools.brms.client.modeldriven.DropDownData;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.FieldEditListener;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.InfoPopup;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.common.ValueChanged;
+import org.drools.guvnor.client.modeldriven.DropDownData;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -21,10 +21,10 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.DirtyableHorizontalPane;
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.DirtyableHorizontalPane;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.Composite;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,22 +17,22 @@
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.DirtyableFlexTable;
-import org.drools.brms.client.common.DirtyableHorizontalPane;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.InfoPopup;
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.modeldriven.HumanReadable;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.FieldConstraint;
-import org.drools.brms.client.modeldriven.brl.IPattern;
-import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.DirtyableFlexTable;
+import org.drools.guvnor.client.common.DirtyableHorizontalPane;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.InfoPopup;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.HumanReadable;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.FieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.IPattern;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AbsolutePanel;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/modeldriven/ui/RuleAttributeWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,11 +17,11 @@
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.DirtyableHorizontalPane;
-import org.drools.brms.client.common.FormStyleLayout;
-import org.drools.brms.client.modeldriven.brl.RuleAttribute;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.DirtyableHorizontalPane;
+import org.drools.guvnor.client.common.FormStyleLayout;
+import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.ChangeListener;
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/brms/client/modeldriven/ui/RuleModeller.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,30 +20,30 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.DirtyableFlexTable;
-import org.drools.brms.client.common.DirtyableHorizontalPane;
-import org.drools.brms.client.common.DirtyableVerticalPane;
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.modeldriven.HumanReadable;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brl.ActionInsertLogicalFact;
-import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brl.ActionSetField;
-import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.IAction;
-import org.drools.brms.client.modeldriven.brl.IPattern;
-import org.drools.brms.client.modeldriven.brl.RuleAttribute;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.client.packages.SuggestionCompletionCache;
-import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.DirtyableFlexTable;
+import org.drools.guvnor.client.common.DirtyableHorizontalPane;
+import org.drools.guvnor.client.common.DirtyableVerticalPane;
+import org.drools.guvnor.client.common.ErrorPopup;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.modeldriven.HumanReadable;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionInsertLogicalFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionRetractFact;
+import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
+import org.drools.guvnor.client.modeldriven.brl.ActionUpdateField;
+import org.drools.guvnor.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.IAction;
+import org.drools.guvnor.client.modeldriven.brl.IPattern;
+import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.packages.SuggestionCompletionCache;
+import org.drools.guvnor.client.rpc.RuleAsset;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.ChangeListener;
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/package.html (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/package.html)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/package.html (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/package.html 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,6 @@
+<body>
+ This package (and subpackages) is all UI code that is used by the GWT to implement the front end.
+ It uses the /server sibling package (which runs in a servlet container).
+ The rpc subpackage provides the service definitions and DTOs that the front end uses.
+
+</body>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/AssetAttachmentFileWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages/AssetAttachmentFileWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/AssetAttachmentFileWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
/*
* Copyright 2005 JBoss Inc
*
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.FormStyleLayout;
-import org.drools.brms.client.common.HTMLFileManagerFields;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.ruleeditor.RuleViewer;
+import org.drools.guvnor.client.common.ErrorPopup;
+import org.drools.guvnor.client.common.FormStyleLayout;
+import org.drools.guvnor.client.common.HTMLFileManagerFields;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.ruleeditor.RuleViewer;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Window;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/FactTemplateWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages/FactTemplateWizard.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/FactTemplateWizard.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,7 +17,7 @@
-import org.drools.brms.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.FormStylePopup;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/ModelAttachmentFileWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages/ModelAttachmentFileWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/ModelAttachmentFileWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,8 +17,8 @@
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.ruleeditor.RuleViewer;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.ruleeditor.RuleViewer;
/**
* This wraps a file uploader utility for model packages.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages/NewPackageWizard.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,14 +17,14 @@
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.FormStyleLayout;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.HTMLFileManagerFields;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.common.ErrorPopup;
+import org.drools.guvnor.client.common.FormStyleLayout;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.HTMLFileManagerFields;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages/PackageBuilderWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
/*
* Copyright 2005 JBoss Inc
@@ -20,16 +20,16 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.brms.client.common.FormStyleLayout;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.InfoPopup;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.rpc.BuilderResult;
-import org.drools.brms.client.rpc.PackageConfigData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.SnapshotInfo;
-import org.drools.brms.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.common.FormStyleLayout;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.InfoPopup;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.rpc.BuilderResult;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.SnapshotInfo;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages/PackageEditor2.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,17 +19,17 @@
import java.util.Date;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.PrettyFormLayout;
-import org.drools.brms.client.common.StatusChangePopup;
-import org.drools.brms.client.common.ValidationMessageWidget;
-import org.drools.brms.client.rpc.PackageConfigData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.ValidatedResponse;
-import org.drools.brms.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.common.StatusChangePopup;
+import org.drools.guvnor.client.common.ValidationMessageWidget;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.ValidatedResponse;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Window;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages/PackageHeaderWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,15 +1,15 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.InfoPopup;
-import org.drools.brms.client.rpc.PackageConfigData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.InfoPopup;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageNameValidator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages/PackageNameValidator.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageNameValidator.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
public class PackageNameValidator {
public static boolean validatePackageName(String name) {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages/SnapshotView.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,19 +1,19 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.PrettyFormLayout;
-import org.drools.brms.client.common.RulePackageSelector;
-import org.drools.brms.client.explorer.ExplorerLayoutManager;
-import org.drools.brms.client.explorer.ExplorerNodeConfig;
-import org.drools.brms.client.explorer.ExplorerViewCenterPanel;
-import org.drools.brms.client.rpc.PackageConfigData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.SnapshotInfo;
-import org.drools.brms.client.rulelist.AssetItemGrid;
-import org.drools.brms.client.rulelist.AssetItemGridDataLoader;
-import org.drools.brms.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.common.RulePackageSelector;
+import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
+import org.drools.guvnor.client.explorer.ExplorerNodeConfig;
+import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.SnapshotInfo;
+import org.drools.guvnor.client.rulelist.AssetItemGrid;
+import org.drools.guvnor.client.rulelist.AssetItemGridDataLoader;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Window;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/packages/SuggestionCompletionCache.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,11 +20,11 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.common.ErrorPopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.Command;
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/qa)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisResultWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/qa/AnalysisResultWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisResultWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,10 +1,10 @@
-package org.drools.brms.client.qa;
+package org.drools.guvnor.client.qa;
-import org.drools.brms.client.common.FormStyleLayout;
-import org.drools.brms.client.rpc.AnalysisFactUsage;
-import org.drools.brms.client.rpc.AnalysisFieldUsage;
-import org.drools.brms.client.rpc.AnalysisReport;
-import org.drools.brms.client.rpc.AnalysisReportLine;
+import org.drools.guvnor.client.common.FormStyleLayout;
+import org.drools.guvnor.client.rpc.AnalysisFactUsage;
+import org.drools.guvnor.client.rpc.AnalysisFieldUsage;
+import org.drools.guvnor.client.rpc.AnalysisReport;
+import org.drools.guvnor.client.rpc.AnalysisReportLine;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisView.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/qa/AnalysisView.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisView.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,10 +1,10 @@
-package org.drools.brms.client.qa;
+package org.drools.guvnor.client.qa;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.PrettyFormLayout;
-import org.drools.brms.client.rpc.AnalysisReport;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.rpc.AnalysisReport;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/qa/BulkRunResultWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,12 +1,12 @@
-package org.drools.brms.client.qa;
+package org.drools.guvnor.client.qa;
-import org.drools.brms.client.common.PrettyFormLayout;
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.packages.PackageBuilderWidget;
-import org.drools.brms.client.rpc.BuilderResult;
-import org.drools.brms.client.rpc.BulkTestRunResult;
-import org.drools.brms.client.rpc.ScenarioResultSummary;
-import org.drools.brms.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.packages.PackageBuilderWidget;
+import org.drools.guvnor.client.rpc.BuilderResult;
+import org.drools.guvnor.client.rpc.BulkTestRunResult;
+import org.drools.guvnor.client.rpc.ScenarioResultSummary;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/qa/ScenarioHelper.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioHelper.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.qa;
+package org.drools.guvnor.client.qa;
import java.util.ArrayList;
import java.util.HashMap;
@@ -6,14 +6,14 @@
import java.util.List;
import java.util.Map;
-import org.drools.brms.client.modeldriven.testing.ExecutionTrace;
-import org.drools.brms.client.modeldriven.testing.Expectation;
-import org.drools.brms.client.modeldriven.testing.FactData;
-import org.drools.brms.client.modeldriven.testing.FieldData;
-import org.drools.brms.client.modeldriven.testing.Fixture;
-import org.drools.brms.client.modeldriven.testing.RetractFact;
-import org.drools.brms.client.modeldriven.testing.VerifyFact;
-import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
+import org.drools.guvnor.client.modeldriven.testing.Expectation;
+import org.drools.guvnor.client.modeldriven.testing.FactData;
+import org.drools.guvnor.client.modeldriven.testing.FieldData;
+import org.drools.guvnor.client.modeldriven.testing.Fixture;
+import org.drools.guvnor.client.modeldriven.testing.RetractFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
/**
* Some utility methods as the display logic is a bit hairy.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioPackageView.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/qa/ScenarioPackageView.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioPackageView.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,15 +1,15 @@
-package org.drools.brms.client.qa;
+package org.drools.guvnor.client.qa;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.PrettyFormLayout;
-import org.drools.brms.client.explorer.ExplorerViewCenterPanel;
-import org.drools.brms.client.rpc.BulkTestRunResult;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rulelist.AssetItemGrid;
-import org.drools.brms.client.rulelist.AssetItemGridDataLoader;
-import org.drools.brms.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
+import org.drools.guvnor.client.rpc.BulkTestRunResult;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rulelist.AssetItemGrid;
+import org.drools.guvnor.client.rulelist.AssetItemGridDataLoader;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/qa/ScenarioWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.qa;
+package org.drools.guvnor.client.qa;
import java.util.ArrayList;
import java.util.Date;
@@ -8,33 +8,33 @@
import java.util.List;
import java.util.Map;
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.DirtyableFlexTable;
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.SmallLabel;
-import org.drools.brms.client.common.ValueChanged;
-import org.drools.brms.client.modeldriven.DropDownData;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.testing.ExecutionTrace;
-import org.drools.brms.client.modeldriven.testing.FactData;
-import org.drools.brms.client.modeldriven.testing.FieldData;
-import org.drools.brms.client.modeldriven.testing.Fixture;
-import org.drools.brms.client.modeldriven.testing.RetractFact;
-import org.drools.brms.client.modeldriven.testing.Scenario;
-import org.drools.brms.client.modeldriven.testing.VerifyFact;
-import org.drools.brms.client.modeldriven.testing.VerifyField;
-import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
-import org.drools.brms.client.modeldriven.ui.ActionValueEditor;
-import org.drools.brms.client.modeldriven.ui.ConstraintValueEditor;
-import org.drools.brms.client.packages.SuggestionCompletionCache;
-import org.drools.brms.client.rpc.BuilderResult;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.rpc.ScenarioRunResult;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.DirtyableFlexTable;
+import org.drools.guvnor.client.common.ErrorPopup;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.common.ValueChanged;
+import org.drools.guvnor.client.modeldriven.DropDownData;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
+import org.drools.guvnor.client.modeldriven.testing.FactData;
+import org.drools.guvnor.client.modeldriven.testing.FieldData;
+import org.drools.guvnor.client.modeldriven.testing.Fixture;
+import org.drools.guvnor.client.modeldriven.testing.RetractFact;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyField;
+import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.guvnor.client.modeldriven.ui.ActionValueEditor;
+import org.drools.guvnor.client.modeldriven.ui.ConstraintValueEditor;
+import org.drools.guvnor.client.packages.SuggestionCompletionCache;
+import org.drools.guvnor.client.rpc.BuilderResult;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.ScenarioRunResult;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisFactUsage.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/AnalysisFactUsage.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisFactUsage.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisFieldUsage.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/AnalysisFieldUsage.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisFieldUsage.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisReport.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/AnalysisReport.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisReport.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisReportLine.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/AnalysisReportLine.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/AnalysisReportLine.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/BuilderResult.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/BuilderResult.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/BuilderResult.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/BulkTestRunResult.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/BulkTestRunResult.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/BulkTestRunResult.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/DetailedSerializableException.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/DetailedSerializableException.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/DetailedSerializableException.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
import com.google.gwt.user.client.rpc.SerializableException;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/LogEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/LogEntry.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/LogEntry.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
import java.util.Date;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/MetaData.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/MetaData.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/MetaData.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/PackageConfigData.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/PackageConfigData.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/PackageConfigData.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
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/brms/client/rpc/RepositoryService.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,8 +17,8 @@
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.SerializableException;
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/brms/client/rpc/RepositoryServiceAsync.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
@@ -47,11 +47,11 @@
public void loadRuleAsset(java.lang.String p0, AsyncCallback cb);
public void loadAssetHistory(java.lang.String p0, AsyncCallback cb);
public void loadArchivedAssets(int p0, int p1, AsyncCallback cb);
- public void checkinVersion(org.drools.brms.client.rpc.RuleAsset p0, AsyncCallback cb);
+ public void checkinVersion(org.drools.guvnor.client.rpc.RuleAsset p0, AsyncCallback cb);
public void restoreVersion(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
public void createPackage(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
public void loadPackageConfig(java.lang.String p0, AsyncCallback cb);
- public void savePackage(org.drools.brms.client.rpc.PackageConfigData p0, AsyncCallback cb);
+ public void savePackage(org.drools.guvnor.client.rpc.PackageConfigData p0, AsyncCallback cb);
public void listAssets(java.lang.String p0, String[] p1, int p2, int p3, java.lang.String p4, AsyncCallback cb);
public void listStates(AsyncCallback cb);
public void createState(java.lang.String p0, AsyncCallback cb);
@@ -67,8 +67,8 @@
public void loadSuggestionCompletionEngine(java.lang.String p0, AsyncCallback cb);
public void buildPackage(java.lang.String p0, java.lang.String p1, boolean p2, AsyncCallback cb);
public void buildPackageSource(java.lang.String p0, AsyncCallback cb);
- public void buildAssetSource(org.drools.brms.client.rpc.RuleAsset p0, AsyncCallback cb);
- public void buildAsset(org.drools.brms.client.rpc.RuleAsset p0, AsyncCallback cb);
+ public void buildAssetSource(org.drools.guvnor.client.rpc.RuleAsset p0, AsyncCallback cb);
+ public void buildAsset(org.drools.guvnor.client.rpc.RuleAsset p0, AsyncCallback cb);
public void renameAsset(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
public void renameCategory(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
public void archiveAsset(java.lang.String p0, boolean p1, AsyncCallback cb);
@@ -77,7 +77,7 @@
public void renamePackage(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
public void rebuildSnapshots(AsyncCallback cb);
public void listRulesInPackage(java.lang.String p0, AsyncCallback cb);
- public void runScenario(java.lang.String p0, org.drools.brms.client.modeldriven.testing.Scenario p1, AsyncCallback cb);
+ public void runScenario(java.lang.String p0, org.drools.guvnor.client.modeldriven.testing.Scenario p1, AsyncCallback cb);
public void runScenariosInPackage(java.lang.String p0, AsyncCallback cb);
public void analysePackage(java.lang.String p0, AsyncCallback cb);
public void listTypesInPackage(java.lang.String p0, AsyncCallback cb);
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceFactory.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RuleAsset.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/RuleAsset.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RuleAsset.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RuleContentText.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/RuleContentText.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RuleContentText.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ScenarioResultSummary.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/ScenarioResultSummary.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ScenarioResultSummary.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ScenarioRunResult.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/ScenarioRunResult.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ScenarioRunResult.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,6 +1,6 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
-import org.drools.brms.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SecurityService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/SecurityService.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SecurityService.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SecurityServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/SecurityServiceAsync.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SecurityServiceAsync.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SessionExpiredException.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/SessionExpiredException.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SessionExpiredException.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
import com.google.gwt.user.client.rpc.SerializableException;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SnapshotInfo.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/SnapshotInfo.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/SnapshotInfo.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/TableConfig.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableConfig.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableDataResult.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/TableDataResult.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableDataResult.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableDataRow.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/TableDataRow.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableDataRow.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/UserSecurityContext.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/UserSecurityContext.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/UserSecurityContext.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
import java.util.Set;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ValidatedResponse.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rpc/ValidatedResponse.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ValidatedResponse.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor)
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/brms/client/ruleeditor/ActionToolbar.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -18,13 +18,13 @@
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.RulePackageSelector;
-import org.drools.brms.client.common.StatusChangePopup;
-import org.drools.brms.client.rpc.MetaData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.RulePackageSelector;
+import org.drools.guvnor.client.common.StatusChangePopup;
+import org.drools.guvnor.client.rpc.MetaData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.RuleAsset;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Window;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/AssetCategoryEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/AssetCategoryEditor.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/AssetCategoryEditor.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,13 +17,13 @@
-import org.drools.brms.client.categorynav.CategoryExplorerWidget;
-import org.drools.brms.client.categorynav.CategorySelectHandler;
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.DirtyableFlexTable;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.rpc.MetaData;
+import org.drools.guvnor.client.categorynav.CategoryExplorerWidget;
+import org.drools.guvnor.client.categorynav.CategorySelectHandler;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.DirtyableFlexTable;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.rpc.MetaData;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/CheckinPopup.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,8 +17,8 @@
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.FormStylePopup;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ChoiceList.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/ChoiceList.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ChoiceList.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
@@ -18,7 +18,7 @@
import java.util.List;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DSLRuleEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/DSLRuleEditor.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DSLRuleEditor.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
-import org.drools.brms.client.packages.SuggestionCompletionCache;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.rpc.RuleContentText;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.packages.SuggestionCompletionCache;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.RuleContentText;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.ClickListener;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/DefaultRuleContentWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.rpc.RuleContentText;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.RuleContentText;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.KeyboardListenerAdapter;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/EditorLauncher.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,14 +20,14 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.common.DefaultContentUploadEditor;
-import org.drools.brms.client.decisiontable.DecisionTableXLSWidget;
-import org.drools.brms.client.decisiontable.GuidedDecisionTableWidget;
-import org.drools.brms.client.modeldriven.ui.RuleModeller;
-import org.drools.brms.client.packages.ModelAttachmentFileWidget;
-import org.drools.brms.client.qa.ScenarioWidget;
-import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.common.DefaultContentUploadEditor;
+import org.drools.guvnor.client.decisiontable.DecisionTableXLSWidget;
+import org.drools.guvnor.client.decisiontable.GuidedDecisionTableWidget;
+import org.drools.guvnor.client.modeldriven.ui.RuleModeller;
+import org.drools.guvnor.client.packages.ModelAttachmentFileWidget;
+import org.drools.guvnor.client.qa.ScenarioWidget;
+import org.drools.guvnor.client.rpc.RuleAsset;
import com.google.gwt.user.client.ui.Widget;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ListUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/ListUtil.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ListUtil.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,7 +20,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
public class ListUtil {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,13 +19,13 @@
import java.util.Date;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.PrettyFormLayout;
-import org.drools.brms.client.common.RulePackageSelector;
-import org.drools.brms.client.rpc.MetaData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.common.RulePackageSelector;
+import org.drools.guvnor.client.rpc.MetaData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Window;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,15 +17,15 @@
-import org.drools.brms.client.categorynav.CategoryExplorerWidget;
-import org.drools.brms.client.categorynav.CategorySelectHandler;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.RulePackageSelector;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.categorynav.CategoryExplorerWidget;
+import org.drools.guvnor.client.categorynav.CategorySelectHandler;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.common.RulePackageSelector;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleDocumentWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/RuleDocumentWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleDocumentWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,8 +17,8 @@
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.rpc.MetaData;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.rpc.MetaData;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.TextArea;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowUploadWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/RuleFlowUploadWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowUploadWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,8 +17,8 @@
-import org.drools.brms.client.packages.AssetAttachmentFileWidget;
-import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
+import org.drools.guvnor.client.rpc.RuleAsset;
import com.google.gwt.user.client.ui.HTML;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleValidatorWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/RuleValidatorWrapper.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleValidatorWrapper.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,14 +17,14 @@
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.packages.PackageBuilderWidget;
-import org.drools.brms.client.rpc.BuilderResult;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.packages.PackageBuilderWidget;
+import org.drools.guvnor.client.rpc.BuilderResult;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.RuleAsset;
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HTML;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,15 +17,15 @@
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.common.DirtyableComposite;
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.packages.SuggestionCompletionCache;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.ErrorPopup;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.packages.SuggestionCompletionCache;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.RuleAsset;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/SaveEventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/SaveEventListener.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/SaveEventListener.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/**
* This is used to notify that a save even is about to occur.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
@@ -19,16 +19,16 @@
import java.util.Arrays;
import java.util.Comparator;
-import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.rpc.MetaData;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.rpc.TableDataResult;
-import org.drools.brms.client.rpc.TableDataRow;
-import org.drools.brms.client.table.DataModel;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.rpc.MetaData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.TableDataResult;
+import org.drools.guvnor.client.rpc.TableDataRow;
+import org.drools.guvnor.client.table.DataModel;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rulelist)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rulelist/AssetItemGrid.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rulelist;
+package org.drools.guvnor.client.rulelist;
/*
* Copyright 2005 JBoss Inc
@@ -19,13 +19,13 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.TableConfig;
-import org.drools.brms.client.rpc.TableDataResult;
-import org.drools.brms.client.rpc.TableDataRow;
-import org.drools.brms.client.ruleeditor.EditorLauncher;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.TableConfig;
+import org.drools.guvnor.client.rpc.TableDataResult;
+import org.drools.guvnor.client.rpc.TableDataRow;
+import org.drools.guvnor.client.ruleeditor.EditorLauncher;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Composite;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGridDataLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rulelist/AssetItemGridDataLoader.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGridDataLoader.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,6 +1,6 @@
-package org.drools.brms.client.rulelist;
+package org.drools.guvnor.client.rulelist;
-import org.drools.brms.client.common.GenericCallback;
+import org.drools.guvnor.client.common.GenericCallback;
/**
* This is used by the grid view to load data, in a paged fashion (if possible to do paging).
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/EditItemEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rulelist/EditItemEvent.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/EditItemEvent.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rulelist;
+package org.drools.guvnor.client.rulelist;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rulelist/QuickFindWidget.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rulelist;
+package org.drools.guvnor.client.rulelist;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,13 +20,13 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.brms.client.common.FormStyleLayout;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.PrettyFormLayout;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.TableDataResult;
-import org.drools.brms.client.rpc.TableDataRow;
+import org.drools.guvnor.client.common.FormStyleLayout;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.common.PrettyFormLayout;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.TableDataResult;
+import org.drools.guvnor.client.rpc.TableDataRow;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.CheckBox;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/RuleListItem.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rulelist/RuleListItem.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/RuleListItem.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -16,7 +16,7 @@
*/
-package org.drools.brms.client.rulelist;
+package org.drools.guvnor.client.rulelist;
/**
* A simple structure containing the an item in a list for a rule asset.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/RuleListViewLegacy.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/rulelist/RuleListViewLegacy.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/RuleListViewLegacy.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rulelist;
+package org.drools.guvnor.client.rulelist;
/*
* Copyright 2005 JBoss Inc
*
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/table (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/table)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/table/DataModel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/table/DataModel.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/table/DataModel.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.table;
+package org.drools.guvnor.client.table;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/table/RowData.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/client/table/RowData.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/table/RowData.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.table;
+package org.drools.guvnor.client.table;
/*
* Copyright 2005 JBoss Inc
*
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/gwtutil)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/AsyncInterfaceGenerator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/gwtutil/AsyncInterfaceGenerator.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/gwtutil/AsyncInterfaceGenerator.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.gwtutil;
+package org.drools.guvnor.gwtutil;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,7 +19,7 @@
import java.lang.reflect.Method;
-import org.drools.brms.client.rpc.RepositoryService;
+import org.drools.guvnor.client.rpc.RepositoryService;
/**
* This utility uses reflection to generate the async interface from the
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/public)
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/ServiceImplementation.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,1440 @@
+package org.drools.guvnor.server;
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutput;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.jcr.ItemExistsException;
+import javax.jcr.RepositoryException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+import org.drools.FactHandle;
+import org.drools.RuleBase;
+import org.drools.RuleBaseConfiguration;
+import org.drools.RuleBaseFactory;
+import org.drools.SessionConfiguration;
+import org.drools.base.ClassTypeResolver;
+import org.drools.common.AbstractRuleBase;
+import org.drools.common.DroolsObjectOutputStream;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.compiler.DrlParser;
+import org.drools.compiler.DroolsParserException;
+import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.rpc.AnalysisReport;
+import org.drools.guvnor.client.rpc.BuilderResult;
+import org.drools.guvnor.client.rpc.BulkTestRunResult;
+import org.drools.guvnor.client.rpc.DetailedSerializableException;
+import org.drools.guvnor.client.rpc.LogEntry;
+import org.drools.guvnor.client.rpc.MetaData;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryService;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.ScenarioResultSummary;
+import org.drools.guvnor.client.rpc.ScenarioRunResult;
+import org.drools.guvnor.client.rpc.SnapshotInfo;
+import org.drools.guvnor.client.rpc.TableConfig;
+import org.drools.guvnor.client.rpc.TableDataResult;
+import org.drools.guvnor.client.rpc.TableDataRow;
+import org.drools.guvnor.client.rpc.ValidatedResponse;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.builder.ContentAssemblyError;
+import org.drools.guvnor.server.builder.ContentPackageAssembler;
+import org.drools.guvnor.server.contenthandler.ContentHandler;
+import org.drools.guvnor.server.contenthandler.ContentManager;
+import org.drools.guvnor.server.contenthandler.IRuleAsset;
+import org.drools.guvnor.server.contenthandler.IValidating;
+import org.drools.guvnor.server.contenthandler.ModelContentHandler;
+import org.drools.guvnor.server.util.BRMSSuggestionCompletionLoader;
+import org.drools.guvnor.server.util.LoggingHelper;
+import org.drools.guvnor.server.util.MetaDataMapper;
+import org.drools.guvnor.server.util.TableDisplayHandler;
+import org.drools.guvnor.server.util.VerifierRunner;
+import org.drools.lang.descr.PackageDescr;
+import org.drools.lang.descr.RuleDescr;
+import org.drools.repository.AssetHistoryIterator;
+import org.drools.repository.AssetItem;
+import org.drools.repository.AssetItemIterator;
+import org.drools.repository.AssetPageList;
+import org.drools.repository.CategoryItem;
+import org.drools.repository.PackageItem;
+import org.drools.repository.PackageIterator;
+import org.drools.repository.RulesRepository;
+import org.drools.repository.RulesRepositoryAdministrator;
+import org.drools.repository.RulesRepositoryException;
+import org.drools.repository.StateItem;
+import org.drools.repository.VersionableItem;
+import org.drools.rule.Package;
+import org.drools.testframework.RuleCoverageListener;
+import org.drools.testframework.ScenarioRunner;
+import org.drools.util.DroolsStreamUtils;
+import org.jboss.seam.annotations.AutoCreate;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.remoting.WebRemote;
+import org.jboss.seam.annotations.security.Restrict;
+import org.mvel.MVEL;
+import org.mvel.templates.TemplateRuntime;
+
+import com.google.gwt.user.client.rpc.SerializableException;
+
+/**
+ * This is the implementation of the repository service to drive the GWT based front end.
+ *
+ * @author Michael Neale
+ */
+ at Name("org.drools.brms.client.rpc.RepositoryService")
+ at AutoCreate
+public class ServiceImplementation
+ implements
+ RepositoryService {
+
+ @In
+ public RulesRepository repository;
+
+
+ private static final long serialVersionUID = 400L;
+ private static final DateFormat dateFormatter = DateFormat.getInstance();
+ private static final Logger log = LoggingHelper.getLogger();
+ private MetaDataMapper metaDataMapper = new MetaDataMapper();
+
+ /** Used for a simple cache of binary packages to avoid serialization from the database - for test scenarios.*/
+ static Map<String, RuleBase> ruleBaseCache = Collections.synchronizedMap(new HashMap<String, RuleBase>());
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String[] loadChildCategories(String categoryPath) {
+
+ CategoryItem item = repository.loadCategory( categoryPath );
+ List children = item.getChildTags();
+ String[] list = new String[children.size()];
+ for ( int i = 0; i < list.length; i++ ) {
+ list[i] = ((CategoryItem) children.get( i )).getName();
+ }
+ return list;
+
+ }
+
+
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public Boolean createCategory(String path,
+ String name,
+ String description) {
+
+
+ log.info( "USER:" + repository.getSession().getUserID()
+ + " CREATING cateogory: [" + name + "] in path [" + path + "]" );
+
+ if (path == null || "".equals(path)) {
+ path = "/";
+ }
+
+ CategoryItem item = repository.loadCategory( path );
+ item.addCategory( name, description );
+ repository.save();
+ return Boolean.TRUE;
+ }
+
+
+ /**
+ * This will create a new asset. It will be saved, but not checked in.
+ * The initial state will be the draft state.
+ */
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String createNewRule(String ruleName,
+ String description,
+ String initialCategory,
+ String initialPackage,
+ String format) throws SerializableException {
+
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " CREATING new asset name [" + ruleName + "] in package [" + initialPackage + "]" );
+
+ try {
+
+ PackageItem pkg = repository.loadPackage( initialPackage );
+ AssetItem asset = pkg.addAsset( ruleName, description, initialCategory, format );
+
+ applyPreBuiltTemplates( ruleName,
+ format,
+ asset );
+ repository.save();
+
+
+ return asset.getUUID();
+ } catch (RulesRepositoryException e) {
+ if (e.getCause() instanceof ItemExistsException) {
+ return "DUPLICATE";
+ } else {
+ throw new SerializableException(e.getMessage());
+ }
+ }
+
+ }
+
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void deleteUncheckedRule(String uuid, String initialPackage) {
+ AssetItem asset = repository.loadAssetByUUID( uuid );
+ asset.remove();
+ repository.save();
+ }
+
+ /**
+ * For some format types, we add some sugar by adding a new template.
+ */
+ private void applyPreBuiltTemplates(String ruleName,
+ String format,
+ AssetItem asset) {
+ if (format.equals( AssetFormats.DSL_TEMPLATE_RULE )) {
+ asset.updateContent( "when\n\nthen\n" );
+ } else if (format.equals( AssetFormats.FUNCTION )) {
+ asset.updateContent( "function <returnType> " + ruleName + "(<args here>) {\n\n\n}" );
+ } else if (format.equals( AssetFormats.DSL )) {
+ asset.updateContent( "[when]Condition sentence template {var}=" +
+ "rule language mapping {var}\n" +
+ "[then]Action sentence template=rule language mapping");
+ } else if (format.equals( AssetFormats.DECISION_SPREADSHEET_XLS )) {
+ asset.updateBinaryContentAttachment( this.getClass().getResourceAsStream( "/SampleDecisionTable.xls" ) );
+ asset.updateBinaryContentAttachmentFileName( "SampleDecisionTable.xls" );
+ } else if (format.equals( AssetFormats.ENUMERATION )) {
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public PackageConfigData[] listPackages() {
+ return listPackages(false);
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public PackageConfigData[] listArchivedPackages() {
+ return listPackages(true);
+ }
+
+
+ private PackageConfigData[] listPackages(boolean archive) {
+ List<PackageConfigData> result = new ArrayList<PackageConfigData>();
+ PackageIterator pkgs = repository.listPackages();
+ pkgs.setArchivedIterator(archive);
+ while(pkgs.hasNext()) {
+ PackageItem pkg = (PackageItem) pkgs.next();
+
+ PackageConfigData data = new PackageConfigData();
+ data.uuid = pkg.getUUID();
+ data.name = pkg.getName();
+ data.archived = pkg.isArchived();
+ if (!archive) {
+ result.add(data);
+ } else if (archive && data.archived) {
+ result.add(data);
+ }
+ }
+
+ sortPackages(result);
+ PackageConfigData[] resultArr = result.toArray( new PackageConfigData[result.size()] );
+ return resultArr;
+ }
+
+
+
+ void sortPackages(List<PackageConfigData> result) {
+ Collections.sort( result, new Comparator<Object>() {
+
+ public int compare(final Object o1,
+ final Object o2) {
+ final PackageConfigData d1 = (PackageConfigData) o1;
+ final PackageConfigData d2 = (PackageConfigData) o2;
+ return d1.name.compareTo( d2.name );
+ }
+
+ });
+ }
+
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public TableDataResult loadRuleListForCategories(String categoryPath, int skip, int numRows, String tableConfig) throws SerializableException {
+ //love you
+ //long time = System.currentTimeMillis();
+
+ AssetPageList list = repository.findAssetsByCategory( categoryPath, skip, numRows );
+ TableDisplayHandler handler = new TableDisplayHandler(tableConfig);
+ //log.debug("time for load: " + (System.currentTimeMillis() - time) );
+ return handler.loadRuleListTable( list );
+
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public TableDataResult loadRuleListForState(String stateName, int skip, int numRows, String tableConfig) throws SerializableException {
+ //love you
+ //long time = System.currentTimeMillis();
+
+ AssetPageList list = repository.findAssetsByState( stateName, false, skip, numRows );
+ TableDisplayHandler handler = new TableDisplayHandler(tableConfig);
+ //log.debug("time for load: " + (System.currentTimeMillis() - time) );
+ return handler.loadRuleListTable( list );
+
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public TableConfig loadTableConfig(String listName) {
+ TableDisplayHandler handler = new TableDisplayHandler(listName);
+ return handler.loadTableConfig();
+ }
+
+
+ /**
+ * This actually does the hard work of loading up an asset based
+ * on its format.
+ */
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public RuleAsset loadRuleAsset(String uuid) throws SerializableException {
+
+ AssetItem item = repository.loadAssetByUUID( uuid );
+ RuleAsset asset = new RuleAsset();
+ asset.uuid = uuid;
+
+
+ //load standard meta data
+ asset.metaData = populateMetaData( item );
+
+ // get package header
+ PackageItem pkgItem = repository.loadPackage( asset.metaData.packageName );
+
+ //load the content
+ ContentHandler handler = ContentManager.getHandler( asset.metaData.format );
+ handler.retrieveAssetContent(asset, pkgItem, item);
+
+ return asset;
+
+ }
+
+ private RuleAsset loadAsset(AssetItem item) throws SerializableException {
+ RuleAsset asset = new RuleAsset();
+ asset.uuid = item.getUUID();
+ //load standard meta data
+ asset.metaData = populateMetaData( item );
+ // get package header
+ PackageItem pkgItem = repository.loadPackage( asset.metaData.packageName );
+ //load the content
+ ContentHandler handler = ContentManager.getHandler( asset.metaData.format );
+ handler.retrieveAssetContent(asset, pkgItem, item);
+ return asset;
+ }
+
+
+ /**
+ * read in the meta data, populating all dublin core and versioning stuff.
+ */
+ MetaData populateMetaData(VersionableItem item) {
+ MetaData meta = new MetaData();
+
+ meta.status = (item.getState() != null) ? item.getState().getName() : "";
+
+ metaDataMapper.copyToMetaData( meta, item );
+
+ meta.createdDate = calendarToDate(item.getCreatedDate());
+ meta.lastModifiedDate = calendarToDate( item.getLastModified() );
+
+ return meta;
+ }
+
+ /**
+ * Populate meta data with asset specific info.
+ */
+ MetaData populateMetaData(AssetItem item) {
+ MetaData meta = populateMetaData( (VersionableItem ) item);
+ meta.packageName = item.getPackageName();
+
+ List cats = item.getCategories();
+ meta.categories = new String[cats.size()];
+ for ( int i = 0; i < meta.categories.length; i++ ) {
+ CategoryItem cat = (CategoryItem) cats.get(i);
+ meta.categories[i] = cat.getFullPath();
+ }
+ meta.dateEffective = calendarToDate( item.getDateEffective() );
+ meta.dateExpired = calendarToDate( item.getDateExpired() );
+ return meta;
+
+ }
+
+ private Date calendarToDate(Calendar createdDate) {
+ if (createdDate == null) return null;
+ return createdDate.getTime();
+ }
+
+ private Calendar dateToCalendar(Date date) {
+ if (date == null) return null;
+ Calendar cal = Calendar.getInstance();
+ cal.setTime( date );
+ return cal;
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String checkinVersion(RuleAsset asset) throws SerializableException {
+
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " CHECKING IN asset: [" + asset.metaData.name + "] UUID: [" + asset.uuid + "] ARCHIVED [" + asset.archived + "]");
+
+
+ AssetItem repoAsset = repository.loadAssetByUUID( asset.uuid );
+ if (asset.metaData.lastModifiedDate.before( repoAsset.getLastModified().getTime()) ) {
+ return "ERR: Unable to save this asset, as it has been recently updated by [" + repoAsset.getLastContributor() + "]";
+ }
+
+
+ repoAsset.archiveItem( asset.archived );
+ MetaData meta = asset.metaData;
+
+ metaDataMapper.copyFromMetaData( meta, repoAsset );
+
+ repoAsset.updateDateEffective( dateToCalendar( meta.dateEffective ) );
+ repoAsset.updateDateExpired( dateToCalendar( meta.dateExpired ) );
+
+
+ repoAsset.updateCategoryList( meta.categories );
+ ContentHandler handler = ContentManager.getHandler( repoAsset.getFormat() );//new AssetContentFormatHandler();
+ handler.storeAssetContent( asset, repoAsset );
+
+ if (!(asset.metaData.format.equals(AssetFormats.TEST_SCENARIO))
+ ||
+ asset.metaData.format.equals(AssetFormats.ENUMERATION)) {
+ PackageItem pkg = repoAsset.getPackage();
+ pkg.updateBinaryUpToDate(false);
+ this.ruleBaseCache.remove(pkg.getUUID());
+
+ }
+
+ repoAsset.checkin( meta.checkinComment );
+
+ return repoAsset.getUUID();
+ }
+
+
+
+
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public TableDataResult loadAssetHistory(String uuid) throws SerializableException {
+
+ List<TableDataRow> result = new ArrayList<TableDataRow>();
+
+ AssetItem item = repository.loadAssetByUUID( uuid );
+ AssetHistoryIterator it = item.getHistory();
+
+
+ //MN Note: this uses the lazy iterator, but then loads the whole lot up, and returns it.
+ //The reason for this is that the GUI needs to show things in numeric order by the version number.
+ //When a version is restored, its previous version is NOT what you thought it was - due to how JCR works
+ // (its more like CVS then SVN). So to get a linear progression of versions, we use the incrementing version number,
+ // and load it all up and sort it. This is not ideal.
+ // In future, we may do a "restore" instead just by copying content into a new version, not restoring a node,
+ // in which case the iterator will be in order (or you can just walk all the way back).
+ //So if there are performance problems with looking at lots of historical versions, look at this nasty bit of code.
+ while ( it.hasNext() ) {
+ AssetItem historical = (AssetItem) it.next();//new AssetItem(repo, element);
+ long versionNumber = historical.getVersionNumber();
+ if (! (versionNumber == 0)
+ && ! (versionNumber == item.getVersionNumber() ))
+ {
+ TableDataRow row = new TableDataRow();
+ row.id = historical.getVersionSnapshotUUID();
+ row.values = new String[4];
+ row.values[0] = Long.toString( historical.getVersionNumber());
+ row.values[1] = historical.getCheckinComment();
+ row.values[2] = dateFormatter.format( historical.getLastModified().getTime() );
+ row.values[3] = historical.getStateDescription();
+ result.add( row );
+ }
+ }
+
+ if (result.size() == 0) return null;
+ TableDataResult table = new TableDataResult();
+ table.data = result.toArray(new TableDataRow[result.size()]);
+
+ return table;
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public TableDataResult loadArchivedAssets(int skip, int numRows) throws SerializableException {
+ List<TableDataRow> result = new ArrayList<TableDataRow>();
+
+ AssetItemIterator it = repository.findArchivedAssets();
+ it.skip(skip);
+ int count = 0;
+ while ( it.hasNext() ) {
+
+ AssetItem archived = (AssetItem) it.next();
+
+ TableDataRow row = new TableDataRow();
+ row.id = archived.getUUID();
+ row.values = new String[5];
+
+ row.values[0] = archived.getFormat();
+ row.values[1] = archived.getPackageName();
+ row.values[2] = archived.getName();
+ row.values[3] = archived.getLastContributor();
+ row.values[4] = archived.getLastModified().getTime().toLocaleString();
+
+ result.add( row );
+ count++;
+ if (count == numRows) {
+ break;
+ }
+ }
+
+
+
+ TableDataResult table = new TableDataResult();
+ table.data = result.toArray(new TableDataRow[result.size()]);
+
+ return table;
+ }
+
+
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void restoreVersion(String versionUUID,
+ String assetUUID,
+ String comment) {
+ AssetItem old = repository.loadAssetByUUID( versionUUID );
+ AssetItem head = repository.loadAssetByUUID( assetUUID );
+
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " RESTORE of asset: [" + head.getName() + "] UUID: [" + head.getUUID() + "] with historical version number: [" + old.getVersionNumber() );
+
+
+ repository.restoreHistoricalAsset( old,
+ head,
+ comment );
+
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public byte[] exportRepository() throws SerializableException {
+
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " EXPORTING repository");
+
+ byte [] exportedOutput = null;
+ try {
+ exportedOutput = repository.exportRulesRepository();
+ } catch ( Exception e ) {
+ throw new SerializableException( "Unable to export repository" );
+ }
+ return exportedOutput;
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String createPackage(String name,
+ String description) throws SerializableException {
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " CREATING package [" + name + "]" );
+ PackageItem item = repository.createPackage( name, description );
+
+ return item.getUUID();
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public PackageConfigData loadPackageConfig(String uuid) {
+ PackageItem item = repository.loadPackageByUUID( uuid );
+
+ PackageConfigData data = new PackageConfigData();
+ data.uuid = item.getUUID();
+ data.header = getDroolsHeader(item);
+ data.externalURI = item.getExternalURI();
+ data.description = item.getDescription();
+ data.name = item.getName();
+ data.lastModified = item.getLastModified().getTime();
+ data.dateCreated = item.getCreatedDate().getTime();
+ data.checkinComment = item.getCheckinComment();
+ data.lasContributor = item.getLastContributor();
+ data.state = item.getStateDescription();
+ data.isSnapshot = item.isSnapshot();
+ if (data.isSnapshot) {
+ data.snapshotName = item.getSnapshotName();
+ }
+ return data;
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public ValidatedResponse savePackage(PackageConfigData data) throws SerializableException {
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " SAVING package [" + data.name + "]" );
+
+ PackageItem item = repository.loadPackage( data.name );
+
+ updateDroolsHeader( data.header, item );
+ item.updateExternalURI( data.externalURI );
+ item.updateDescription( data.description );
+ item.archiveItem( data.archived );
+ item.updateBinaryUpToDate(false);
+ this.ruleBaseCache.remove(data.uuid);
+ item.checkin( data.description );
+
+ BRMSSuggestionCompletionLoader loader = new BRMSSuggestionCompletionLoader();
+ loader.getSuggestionEngine( item );
+
+ ValidatedResponse res = new ValidatedResponse();
+ if (loader.hasErrors()) {
+ res.hasErrors = true;
+ String err = "";
+ for ( Iterator iter = loader.getErrors().iterator(); iter.hasNext(); ) {
+ err += (String) iter.next();
+ if (iter.hasNext()) err += "\n";
+ }
+ res.errorHeader = "Package validation errors";
+ res.errorMessage = err;
+ }
+
+
+ return res;
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public TableDataResult listAssets(String uuid,
+ String formats[],
+ int skip,
+ int numRows,
+ String tableConfig) throws SerializableException {
+ if (numRows == 0) {
+ throw new DetailedSerializableException("Unable to return zero results (bug)", "probably have the parameters around the wrong way, sigh...");
+ }
+ long start = System.currentTimeMillis();
+ PackageItem pkg = repository.loadPackageByUUID( uuid );
+ AssetItemIterator it = pkg.listAssetsByFormat( formats );
+ TableDisplayHandler handler = new TableDisplayHandler(tableConfig);
+ log.debug("time for asset list load: " + (System.currentTimeMillis() - start) );
+ return handler.loadRuleListTable( it, skip, numRows );
+ }
+
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String createState(String name) throws SerializableException {
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " CREATING state: [" + name + "]" );
+ try {
+ String uuid = repository.createState( name ).getNode().getUUID();
+ repository.save();
+ return uuid;
+ } catch ( RepositoryException e ) {
+ throw new SerializableException( "Unable to create the status." );
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String[] listStates() throws SerializableException {
+ StateItem[] states = repository.listStates();
+ String[] result = new String[states.length];
+ for ( int i = 0; i < states.length; i++ ) {
+ result[i] = states[i].getName();
+ }
+ return result;
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void changeState(String uuid,
+ String newState,
+ boolean wholePackage) {
+
+ if (!wholePackage) {
+
+ AssetItem asset = repository.loadAssetByUUID( uuid );
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " CHANGING ASSET STATUS. Asset name, uuid: " +
+ "[" + asset.getName() + ", " +asset.getUUID() + "]"
+ + " to [" + newState + "]");
+ asset.updateState( newState );
+ } else {
+ PackageItem pkg = repository.loadPackageByUUID( uuid );
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " CHANGING Package STATUS. Asset name, uuid: " +
+ "[" + pkg.getName() + ", " + pkg.getUUID() + "]"
+ + " to [" + newState + "]");
+ pkg.changeStatus(newState);
+ }
+ repository.save();
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void changeAssetPackage(String uuid,
+ String newPackage,
+ String comment) {
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " CHANGING PACKAGE OF asset: [" + uuid + "] to [" + newPackage + "]");
+ repository.moveRuleItemPackage( newPackage, uuid, comment );
+
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String copyAsset(String assetUUID,
+ String newPackage,
+ String newName) {
+ return repository.copyAsset( assetUUID, newPackage, newName );
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public SnapshotInfo[] listSnapshots(String packageName) {
+
+ String[] snaps = repository.listPackageSnapshots( packageName );
+ SnapshotInfo[] res = new SnapshotInfo[snaps.length];
+ for ( int i = 0; i < snaps.length; i++ ) {
+ PackageItem snap = repository.loadPackageSnapshot( packageName, snaps[i] );
+ SnapshotInfo info = new SnapshotInfo();
+ res[i] = info;
+ info.comment = snap.getCheckinComment();
+ info.name = snaps[i];
+ info.uuid = snap.getUUID();
+ }
+ return res;
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void createPackageSnapshot(String packageName,
+ String snapshotName,
+ boolean replaceExisting,
+ String comment) {
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " CREATING PACKAGE SNAPSHOT for package: [" + packageName + "] snapshot name: [" + snapshotName );
+
+ if (replaceExisting) {
+ repository.removePackageSnapshot( packageName, snapshotName );
+ }
+
+ repository.createPackageSnapshot( packageName, snapshotName );
+ PackageItem item = repository.loadPackageSnapshot( packageName, snapshotName );
+ item.updateCheckinComment( comment );
+ repository.save();
+
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void copyOrRemoveSnapshot(String packageName,
+ String snapshotName,
+ boolean delete,
+ String newSnapshotName) throws SerializableException {
+
+ if (delete) {
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " REMOVING SNAPSHOT for package: [" + packageName + "] snapshot: [" + snapshotName + "]" );
+ repository.removePackageSnapshot( packageName, snapshotName );
+ } else {
+ if (newSnapshotName.equals( "" )) {
+ throw new SerializableException("Need to have a new snapshot name.");
+ }
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " COPYING SNAPSHOT for package: [" + packageName + "] snapshot: [" + snapshotName + "] to [" + newSnapshotName + "]" );
+
+ repository.copyPackageSnapshot( packageName, snapshotName, newSnapshotName );
+ }
+
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public TableDataResult quickFindAsset(String searchText, int max, boolean searchArchived) {
+
+ String search = Pattern.compile("*", Pattern.LITERAL).matcher(searchText).replaceAll(Matcher.quoteReplacement("%"));
+
+ if (!search.endsWith( "%" )) {
+ search += "%";
+ }
+
+
+ TableDataResult result = new TableDataResult();
+
+ List<TableDataRow> resultList = new ArrayList<TableDataRow>();
+
+ long start = System.currentTimeMillis();
+ AssetItemIterator it = repository.findAssetsByName( search, searchArchived ); // search for archived items
+ log.debug("Search time: " + (System.currentTimeMillis() - start));
+ for(int i = 0; i < max; i++) {
+ if (!it.hasNext()) {
+ break;
+ }
+
+ AssetItem item = (AssetItem) it.next();
+ TableDataRow row = new TableDataRow();
+ row.id = item.getUUID();
+ String desc = item.getDescription() + "";
+ row.values = new String[] { item.getName(), desc.substring( 0, Math.min( 32, desc.length() ) ) };
+ resultList.add( row );
+
+ }
+
+ if (it.hasNext()) {
+ TableDataRow empty = new TableDataRow();
+ empty.id = "MORE";
+ resultList.add( empty );
+ }
+
+ result.data = resultList.toArray( new TableDataRow[resultList.size()] );
+ return result;
+
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void removeCategory(String categoryPath) throws SerializableException {
+ log.info( "USER:" + repository.getSession().getUserID() +
+ " REMOVING CATEGORY path: [" + categoryPath + "]" );
+
+ try {
+ repository.loadCategory( categoryPath ).remove();
+ repository.save();
+ } catch (RulesRepositoryException e) {
+ throw new DetailedSerializableException("Unable to remove category. It is probably still used (even by archived items).", e.getMessage());
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void clearRulesRepository() {
+ RulesRepositoryAdministrator admin = new RulesRepositoryAdministrator(repository.getSession());
+ admin.clearRulesRepository();
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public SuggestionCompletionEngine loadSuggestionCompletionEngine(String packageName) throws SerializableException {
+ try {
+
+ PackageItem pkg = repository.loadPackage( packageName );
+ BRMSSuggestionCompletionLoader loader = new BRMSSuggestionCompletionLoader();
+ return loader.getSuggestionEngine( pkg );
+ } catch (RulesRepositoryException e) {
+ log.error( e );
+ throw new SerializableException(e.getMessage());
+ }
+
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public BuilderResult[] buildPackage(String packageUUID, String selectorConfigName, boolean force) throws SerializableException {
+
+ PackageItem item = repository.loadPackageByUUID( packageUUID );
+ return buildPackage(selectorConfigName, force, item);
+ }
+
+ private BuilderResult[] buildPackage(String selectorConfigName,
+ boolean force, PackageItem item)
+ throws DetailedSerializableException {
+ if (!force && item.isBinaryUpToDate()) {
+ //we can just return all OK if its up to date.
+ return null;
+ }
+ ContentPackageAssembler asm = new ContentPackageAssembler(item, selectorConfigName);
+ if (asm.hasErrors()) {
+ BuilderResult[] result = generateBuilderResults( asm );
+ return result;
+ } else {
+ try {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ ObjectOutput out = new DroolsObjectOutputStream(bout);
+ out.writeObject( asm.getBinaryPackage() );
+
+ item.updateCompiledPackage( new ByteArrayInputStream( bout.toByteArray()) );
+ out.flush();
+ out.close();
+
+ updateBinaryPackage(item, asm);
+ repository.save();
+ } catch (Exception e) {
+ log.error( e );
+ throw new DetailedSerializableException("An error occurred building the package.", e.getMessage());
+ }
+
+
+ return null;
+
+ }
+ }
+
+ private void updateBinaryPackage(PackageItem item,
+ ContentPackageAssembler asm) throws Exception {
+ item.updateBinaryUpToDate(true);
+ RuleBase rb = RuleBaseFactory.newRuleBase();
+ rb.addPackage(asm.getBinaryPackage());
+ //this.ruleBaseCache.put(item.getUUID(), rb);
+ }
+
+
+
+ private BuilderResult[] generateBuilderResults(ContentPackageAssembler asm) {
+ BuilderResult[] result = new BuilderResult[asm.getErrors().size()];
+ for ( int i = 0; i < result.length; i++ ) {
+ ContentAssemblyError err = asm.getErrors().get( i );
+ BuilderResult res = new BuilderResult();
+ res.assetName = err.itemInError.getName();
+ res.assetFormat = err.itemInError.getFormat();
+ res.message = err.errorReport;
+ res.uuid = err.itemInError.getUUID();
+ result[i] = res;
+ }
+ return result;
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String buildPackageSource(String packageUUID) throws SerializableException {
+ PackageItem item = repository.loadPackageByUUID( packageUUID );
+ ContentPackageAssembler asm = new ContentPackageAssembler(item, false);
+ return asm.getDRL();
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String buildAssetSource(RuleAsset asset) throws SerializableException {
+ AssetItem item = repository.loadAssetByUUID( asset.uuid );
+
+ ContentHandler handler = ContentManager.getHandler( item.getFormat() );//new AssetContentFormatHandler();
+ handler.storeAssetContent( asset, item );
+ StringBuffer buf = new StringBuffer();
+ if (handler.isRuleAsset()) {
+
+ BRMSPackageBuilder builder = new BRMSPackageBuilder(new PackageBuilderConfiguration());
+ //now we load up the DSL files
+ builder.setDSLFiles( BRMSPackageBuilder.getDSLMappingFiles( item.getPackage(), new BRMSPackageBuilder.DSLErrorEvent() {
+ public void recordError(AssetItem asset, String message) {
+ //ignore at this point...
+ }
+ }));
+ ((IRuleAsset) handler).assembleDRL( builder, item, buf );
+ } else {
+ return item.getContent();
+ }
+
+ return buf.toString();
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public BuilderResult[] buildAsset(RuleAsset asset) throws SerializableException {
+
+ try {
+
+ AssetItem item = repository.loadAssetByUUID( asset.uuid );
+
+ ContentHandler handler = ContentManager.getHandler( item.getFormat() );//new AssetContentFormatHandler();
+ handler.storeAssetContent( asset, item );
+
+
+ if (handler instanceof IValidating) {
+ return ((IValidating) handler).validateAsset( item );
+ } else {
+
+ ContentPackageAssembler asm = new ContentPackageAssembler(item);
+ if (!asm.hasErrors()) {
+ return null;
+ } else {
+ return generateBuilderResults( asm );
+ }
+ }
+ } catch (Exception e) {
+ log.error(e);
+ BuilderResult[] result = new BuilderResult[1];
+
+ BuilderResult res = new BuilderResult();
+ res.assetName = asset.metaData.name;
+ res.assetFormat = asset.metaData.format;
+ res.message = "Unable to validate this asset. (Check log for detailed messages).";
+ res.uuid = asset.uuid;
+ result[0] = res;
+
+
+ return result;
+ }
+
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void copyPackage(String sourcePackageName, String destPackageName) throws SerializableException {
+ try {
+ repository.copyPackage( sourcePackageName, destPackageName );
+ } catch (RulesRepositoryException e) {
+ log.error( e );
+ throw e;
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String renameAsset(String uuid, String newName) {
+ return repository.renameAsset( uuid, newName );
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void archiveAsset(String uuid, boolean value) {
+ try {
+ AssetItem item = repository.loadAssetByUUID( uuid );
+ item.archiveItem( value );
+ PackageItem pkg = item.getPackage();
+ pkg.updateBinaryUpToDate(false);
+ this.ruleBaseCache.remove(pkg.getUUID());
+ item.checkin( "unarchived" );
+
+ } catch (RulesRepositoryException e) {
+ log.error( e );
+ throw e;
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void removeAsset(String uuid) {
+ try {
+ AssetItem item = repository.loadAssetByUUID( uuid );
+ item.remove();
+ repository.save();
+ } catch (RulesRepositoryException e) {
+ log.error( e );
+ throw e;
+ }
+ }
+
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void removePackage(String uuid) {
+ try {
+ PackageItem item = repository.loadPackageByUUID(uuid);
+ item.remove();
+ repository.save();
+ } catch (RulesRepositoryException e) {
+ log.error( e );
+ throw e;
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String renamePackage(String uuid, String newName) {
+ return repository.renamePackage( uuid, newName );
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void rebuildSnapshots() throws SerializableException {
+ Iterator pkit = repository.listPackages();
+ while(pkit.hasNext()) {
+ PackageItem pkg = (PackageItem) pkit.next();
+ String[] snaps = repository.listPackageSnapshots( pkg.getName() );
+ for ( String snapName : snaps ) {
+ PackageItem snap = repository.loadPackageSnapshot( pkg.getName(), snapName );
+ BuilderResult[] res = this.buildPackage( snap.getUUID(), "", true ) ;
+ if (res != null) {
+ StringBuffer buf = new StringBuffer();
+ for ( int i = 0; i < res.length; i++ ) {
+ buf.append( res[i].toString() );
+ buf.append( '\n' );
+ }
+ throw new DetailedSerializableException("Unable to rebuild snapshot [" + snapName, buf.toString() + "]" );
+ }
+ }
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String[] listRulesInPackage(String packageName) throws SerializableException {
+
+ PackageItem item = repository.loadPackage(packageName);
+ ContentPackageAssembler asm = new ContentPackageAssembler(item, false);
+ List<String> result = new ArrayList<String>();
+ DrlParser p = new DrlParser();
+ try {
+ PackageDescr pkg = p.parse(asm.getDRL());
+ int count = 0;
+ for (Iterator iterator = pkg.getRules().iterator(); iterator.hasNext();) {
+ RuleDescr r = (RuleDescr) iterator.next();
+ result.add(r.getName());
+ count++;
+ if (count == 5000) {
+ result.add("More then 5000 rules.");
+ break;
+ }
+ }
+ return result.toArray(new String[result.size()]);
+ } catch (DroolsParserException e) {
+ log.error(e);
+ return new String[0];
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public ScenarioRunResult runScenario(String packageName, Scenario scenario)
+ throws SerializableException {
+ PackageItem item = this.repository.loadPackage(packageName);
+
+ //nasty classloader needed to make sure we use the same tree the whole time.
+ ClassLoader originalCL = Thread.currentThread().getContextClassLoader();
+
+
+
+ try {
+ if (item.isBinaryUpToDate() && this.ruleBaseCache.containsKey(item.getUUID())) {
+ RuleBase rb = this.ruleBaseCache.get(item.getUUID());
+ AbstractRuleBase arb = (AbstractRuleBase) rb;
+ //load up the existing class loader from before
+
+ } else {
+ //load up the classloader we are going to use
+ List<JarInputStream> jars = BRMSPackageBuilder.getJars(item);
+ ClassLoader buildCl = BRMSPackageBuilder.createClassLoader(jars);
+
+ //we have to build the package, and try again.
+ if (item.isBinaryUpToDate()) {
+ this.ruleBaseCache.put(item.getUUID(), loadRuleBase(item, buildCl));
+ } else {
+ BuilderResult[] errs = this.buildPackage(null, false, item);
+ if (errs == null || errs.length == 0) {
+ this.ruleBaseCache.put(item.getUUID(), loadRuleBase(item, buildCl));
+ } else {
+ return new ScenarioRunResult(errs, null);
+ }
+ }
+ }
+
+ ClassLoader cl = this.ruleBaseCache.get(item.getUUID()).getPackages()[0].getPackageScopeClassLoader();
+ Thread.currentThread().setContextClassLoader(cl);
+ return runScenario(scenario, item, cl);
+
+ } finally {
+ Thread.currentThread().setContextClassLoader(originalCL);
+ }
+
+
+ }
+
+ private RuleBase loadRuleBase(PackageItem item, ClassLoader cl) throws DetailedSerializableException {
+ try {
+ RuleBase rb = RuleBaseFactory.newRuleBase(new RuleBaseConfiguration(cl));
+ Package bin = (Package) DroolsStreamUtils.streamIn(item.getCompiledPackageBytes(), cl);
+ rb.addPackage(bin);
+ return rb;
+ } catch (ClassNotFoundException e) {
+ log.error(e);
+ throw new DetailedSerializableException("A required class was not found.", e.getMessage());
+ } catch (Exception e) {
+ log.error(e);
+ throw new DetailedSerializableException("Unable to load a rulebase.", e.getMessage());
+ }
+ }
+
+ private ScenarioRunResult runScenario(
+ Scenario scenario, PackageItem item, ClassLoader cl)
+ throws DetailedSerializableException {
+
+ RuleBase rb = ruleBaseCache.get(item.getUUID());
+ Package bin = rb.getPackages()[0];
+
+
+ Set<String> imps = bin.getImports().keySet();
+ Set<String> allImps = new HashSet<String>(imps);
+ if (bin.getGlobals() != null) {
+ for (Iterator iterator = bin.getGlobals().keySet().iterator(); iterator.hasNext();) {
+ Class c = (Class) bin.getGlobals().get(iterator.next());
+ allImps.add(c.getName());
+ }
+ }
+ allImps.add(bin.getName() + ".*"); //need this for Generated beans to work
+
+
+ ClassTypeResolver res = new ClassTypeResolver(allImps, cl);
+ SessionConfiguration sessionConfiguration = new SessionConfiguration();
+ sessionConfiguration.setKeepReference( false );
+ InternalWorkingMemory workingMemory = (InternalWorkingMemory) rb.newStatefulSession(sessionConfiguration);
+ return runScenario(scenario, res, workingMemory);
+ }
+
+ private ScenarioRunResult runScenario(Scenario scenario,
+ ClassTypeResolver res, InternalWorkingMemory workingMemory)
+ throws DetailedSerializableException {
+ try {
+ new ScenarioRunner(scenario, res, workingMemory);
+ return new ScenarioRunResult(null, scenario);
+ } catch (ClassNotFoundException e) {
+ log.error(e);
+ throw new DetailedSerializableException("Unable to load a required class.", e.getMessage());
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public BulkTestRunResult runScenariosInPackage(String packageUUID)
+ throws SerializableException {
+ PackageItem item = repository.loadPackageByUUID(packageUUID);
+
+ ClassLoader originalCL = Thread.currentThread().getContextClassLoader();
+ ClassLoader cl = null;
+
+
+ try {
+ if (item.isBinaryUpToDate() && this.ruleBaseCache.containsKey(item.getUUID())) {
+ RuleBase rb = this.ruleBaseCache.get(item.getUUID());
+ AbstractRuleBase arb = (AbstractRuleBase) rb;
+ //load up the existing class loader from before
+ cl = arb.getConfiguration().getClassLoader();
+ Thread.currentThread().setContextClassLoader(cl);
+ } else {
+ //load up the classloader we are going to use
+ List<JarInputStream> jars = BRMSPackageBuilder.getJars(item);
+ cl = BRMSPackageBuilder.createClassLoader(jars);
+ Thread.currentThread().setContextClassLoader(cl);
+
+ //we have to build the package, and try again.
+ if (item.isBinaryUpToDate()) {
+ this.ruleBaseCache.put(item.getUUID(), loadRuleBase(item, cl));
+ } else {
+ BuilderResult[] errs = this.buildPackage(null, false, item);
+ if (errs == null || errs.length == 0) {
+ this.ruleBaseCache.put(item.getUUID(), loadRuleBase(item, cl));
+ } else {
+ return new BulkTestRunResult(errs, null, 0, null);
+ }
+ }
+ }
+
+
+ AssetItemIterator it = item.listAssetsByFormat(new String[] {AssetFormats.TEST_SCENARIO});
+ List<ScenarioResultSummary> resultSummaries = new ArrayList<ScenarioResultSummary>();
+ RuleBase rb = ruleBaseCache.get(item.getUUID());
+ Package bin = rb.getPackages()[0];
+
+ ClassTypeResolver res = new ClassTypeResolver(bin.getImports().keySet(), cl);
+ SessionConfiguration sessionConfiguration = new SessionConfiguration();
+ sessionConfiguration.setKeepReference( false );
+ InternalWorkingMemory workingMemory = (InternalWorkingMemory) rb.newStatefulSession( sessionConfiguration);
+
+ RuleCoverageListener coverage = new RuleCoverageListener(expectedRules(bin));
+ workingMemory.addEventListener(coverage);
+
+ while(it.hasNext()) {
+ RuleAsset asset = loadAsset((AssetItem) it.next());
+ Scenario sc = (Scenario) asset.content;
+ sc = runScenario(sc, res, workingMemory).scenario;
+
+ //clean out WM
+ Iterator<FactHandle> fhs = workingMemory.iterateFactHandles();
+ while(fhs.hasNext()) {
+ workingMemory.retract(fhs.next());
+ }
+
+ int[] totals = sc.countFailuresTotal();
+ resultSummaries.add(new ScenarioResultSummary(totals[0], totals[1], asset.metaData.name, asset.metaData.description, asset.uuid));
+ }
+
+ ScenarioResultSummary[] summaries = resultSummaries.toArray(new ScenarioResultSummary[resultSummaries.size()]);
+
+ BulkTestRunResult result = new BulkTestRunResult(null,
+ resultSummaries.toArray(summaries),
+ coverage.getPercentCovered(),
+ coverage.getUnfiredRules());
+ return result;
+
+
+ } finally {
+ Thread.currentThread().setContextClassLoader(originalCL);
+ }
+
+
+ }
+
+ private HashSet<String> expectedRules(Package bin) {
+ HashSet<String> h = new HashSet<String>();
+ for (int i = 0; i < bin.getRules().length; i++) {
+ h.add(bin.getRules()[i].getName());
+ }
+ return h;
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public AnalysisReport analysePackage(String packageUUID)
+ throws SerializableException {
+ String drl = this.buildPackageSource(packageUUID);
+ VerifierRunner runner = new VerifierRunner();
+ try {
+ return runner.analyse(drl);
+ } catch (DroolsParserException e) {
+ log.error(e);
+ throw new DetailedSerializableException("Unable to parse the rules.", e.getMessage());
+ }
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String[] listTypesInPackage(String packageUUID) throws SerializableException {
+
+ PackageItem pkg = this.repository.loadPackageByUUID(packageUUID);
+ List<String> res = new ArrayList<String>();
+ AssetItemIterator it = pkg.listAssetsByFormat(new String[] {AssetFormats.MODEL});
+
+ JarInputStream jis = null;
+
+ try {
+ while(it.hasNext()) {
+ AssetItem asset = (AssetItem) it.next();
+ if (!asset.isArchived()) {
+ jis = new JarInputStream(asset.getBinaryContentAttachment());
+ JarEntry entry = null;
+ while ((entry = jis.getNextJarEntry()) != null) {
+ if (!entry.isDirectory()) {
+ if (entry.getName().endsWith(".class")) {
+ res.add(ModelContentHandler.convertPathToName(entry.getName()));
+ }
+ }
+ }
+
+ }
+ }
+ return res.toArray(new String[res.size()]);
+ } catch (IOException e) {
+ log.error(e);
+ throw new DetailedSerializableException("Unable to read the jar files in the package.", e.getMessage());
+ } finally {
+ IOUtils.closeQuietly(jis);
+ }
+
+
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public LogEntry[] showLog() {
+ return LoggingHelper.getMessages();
+
+ }
+
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void renameCategory(String fullPathAndName, String newName) {
+ repository.renameCategory(fullPathAndName, newName);
+ }
+
+ public static String getDroolsHeader(PackageItem pkg) {
+ if (pkg.containsAsset("drools")) {
+ return pkg.loadAsset("drools").getContent();
+ } else {
+ return "";
+ }
+ }
+
+ public static void updateDroolsHeader(String string, PackageItem pkg) {
+ pkg.checkout();
+ AssetItem conf;
+ if (pkg.containsAsset("drools")) {
+ conf = pkg.loadAsset("drools");
+ conf.updateContent(string);
+ conf.checkin("");
+ } else {
+ conf = pkg.addAsset("drools", "");
+ conf.updateFormat("package");
+ conf.updateContent(string);
+ conf.checkin("");
+ }
+
+ }
+
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public String[] loadDropDownExpression(String[] valuePairs, String expression) {
+ Map<String, String> context = new HashMap<String, String>();
+ for (int i = 0; i < valuePairs.length; i++) {
+ String[] pair = valuePairs[i].split("=");
+ context.put(pair[0], pair[1]);
+ }
+ //first interpolate the pairs
+ expression = (String) TemplateRuntime.eval(expression, context);
+
+ //now we can eval it for real...
+ Object result = MVEL.eval(expression);
+ if (result instanceof String[]) {
+ return (String[]) result;
+ } else if (result instanceof List) {
+ List l = (List) result;
+ String[] xs = new String[l.size()];
+ for (int i = 0; i < xs.length; i++) {
+ Object el = l.get(i);
+ xs[i] = el.toString();
+ }
+ return xs;
+ } else {
+ return null;
+ }
+ }
+
+
+
+
+
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/builder)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.builder;
+package org.drools.guvnor.server.builder;
/*
* Copyright 2005 JBoss Inc
*
@@ -30,9 +30,9 @@
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
-import org.drools.brms.client.common.AssetFormats;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.guvnor.client.common.AssetFormats;
import org.drools.lang.dsl.DSLMappingFile;
import org.drools.lang.dsl.DSLMappingParseException;
import org.drools.lang.dsl.DefaultExpander;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentAssemblyError.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/builder/ContentAssemblyError.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentAssemblyError.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.builder;
+package org.drools.guvnor.server.builder;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.builder;
+package org.drools.guvnor.server.builder;
/*
* Copyright 2005 JBoss Inc
*
@@ -16,15 +16,15 @@
*/
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.server.ServiceImplementation;
-import org.drools.brms.server.contenthandler.ContentHandler;
-import org.drools.brms.server.contenthandler.ContentManager;
-import org.drools.brms.server.contenthandler.IRuleAsset;
-import org.drools.brms.server.selector.AssetSelector;
-import org.drools.brms.server.selector.SelectorManager;
import org.drools.compiler.DroolsError;
import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.contenthandler.ContentHandler;
+import org.drools.guvnor.server.contenthandler.ContentManager;
+import org.drools.guvnor.server.contenthandler.IRuleAsset;
+import org.drools.guvnor.server.selector.AssetSelector;
+import org.drools.guvnor.server.selector.SelectorManager;
import org.drools.lang.descr.PackageDescr;
import org.drools.repository.*;
import org.drools.rule.Package;
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/BRLContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,13 +20,13 @@
import java.io.IOException;
import java.io.StringReader;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.server.builder.BRMSPackageBuilder;
-import org.drools.brms.server.builder.ContentPackageAssembler;
-import org.drools.brms.server.util.BRDRLPersistence;
-import org.drools.brms.server.util.BRXMLPersistence;
import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.builder.ContentPackageAssembler;
+import org.drools.guvnor.server.util.BRDRLPersistence;
+import org.drools.guvnor.server.util.BRXMLPersistence;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/ContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,7 +19,7 @@
import java.util.Map;
-import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/ContentManager.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 Barry Knapp
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
@@ -21,9 +21,9 @@
import java.io.StringReader;
import java.util.StringTokenizer;
-import org.drools.brms.server.builder.BRMSPackageBuilder;
-import org.drools.brms.server.builder.ContentPackageAssembler;
import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.builder.ContentPackageAssembler;
import org.drools.repository.AssetItem;
public class DRLFileContentHandler extends PlainTextContentHandler implements IRuleAsset {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLDefinitionContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/DSLDefinitionContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLDefinitionContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/DSLRuleContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
@@ -22,12 +22,12 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.rpc.RuleContentText;
-import org.drools.brms.server.builder.BRMSPackageBuilder;
-import org.drools.brms.server.builder.ContentAssemblyError;
-import org.drools.brms.server.builder.ContentPackageAssembler;
import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.RuleContentText;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.builder.ContentAssemblyError;
+import org.drools.guvnor.server.builder.ContentPackageAssembler;
import org.drools.lang.ExpanderException;
import org.drools.lang.dsl.DSLMappingFile;
import org.drools.lang.dsl.DefaultExpander;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DecisionTableXLSHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/DecisionTableXLSHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DecisionTableXLSHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,12 +20,12 @@
import java.io.IOException;
import java.io.StringReader;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.server.builder.BRMSPackageBuilder;
-import org.drools.brms.server.builder.ContentPackageAssembler.ErrorLogger;
import org.drools.compiler.DroolsParserException;
import org.drools.decisiontable.InputType;
import org.drools.decisiontable.SpreadsheetCompiler;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.builder.ContentPackageAssembler.ErrorLogger;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DefaultContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/DefaultContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DefaultContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,6 +1,6 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
-import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/EnumerationContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/EnumerationContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/EnumerationContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2007 JBoss Inc
@@ -20,8 +20,8 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.brms.client.rpc.BuilderResult;
-import org.drools.brms.server.util.DataEnumLoader;
+import org.drools.guvnor.client.rpc.BuilderResult;
+import org.drools.guvnor.server.util.DataEnumLoader;
import org.drools.repository.AssetItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FunctionContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/FunctionContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FunctionContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/GuidedDTContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,16 +20,16 @@
import java.io.IOException;
import java.io.StringReader;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.server.builder.BRMSPackageBuilder;
-import org.drools.brms.server.builder.ContentPackageAssembler;
-import org.drools.brms.server.util.BRDRLPersistence;
-import org.drools.brms.server.util.BRXMLPersistence;
-import org.drools.brms.server.util.GuidedDTDRLPersistence;
-import org.drools.brms.server.util.GuidedDTXMLPersistence;
import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.builder.ContentPackageAssembler;
+import org.drools.guvnor.server.util.BRDRLPersistence;
+import org.drools.guvnor.server.util.BRXMLPersistence;
+import org.drools.guvnor.server.util.GuidedDTDRLPersistence;
+import org.drools.guvnor.server.util.GuidedDTXMLPersistence;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/IRuleAsset.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/IRuleAsset.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/IRuleAsset.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,9 +19,9 @@
import java.io.IOException;
-import org.drools.brms.server.builder.BRMSPackageBuilder;
-import org.drools.brms.server.builder.ContentPackageAssembler;
import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.builder.ContentPackageAssembler;
import org.drools.repository.AssetItem;
/**
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/IValidating.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/IValidating.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/IValidating.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,6 +1,6 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
-import org.drools.brms.client.rpc.BuilderResult;
+import org.drools.guvnor.client.rpc.BuilderResult;
import org.drools.repository.AssetItem;
/**
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/ModelContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
@@ -21,9 +21,9 @@
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.server.ServiceImplementation;
-import org.drools.brms.server.builder.ContentPackageAssembler;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.builder.ContentPackageAssembler;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PlainTextContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/PlainTextContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PlainTextContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,8 +17,8 @@
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.rpc.RuleContentText;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.RuleContentText;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/RuleFlowHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,10 +20,10 @@
import java.io.IOException;
import java.io.InputStreamReader;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.server.builder.BRMSPackageBuilder;
-import org.drools.brms.server.builder.ContentPackageAssembler.ErrorLogger;
import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.builder.ContentPackageAssembler.ErrorLogger;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ScenarioContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/contenthandler/ScenarioContentHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ScenarioContentHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,8 +1,8 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
-import org.drools.brms.client.modeldriven.testing.Scenario;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.server.util.ScenarioXMLPersistence;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.server.util.ScenarioXMLPersistence;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/files)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AssetFileServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/files/AssetFileServlet.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AssetFileServlet.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
/*
* Copyright 2005 JBoss Inc
*
@@ -24,8 +24,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.drools.brms.client.common.HTMLFileManagerFields;
-import org.drools.brms.server.util.FormData;
+import org.drools.guvnor.client.common.HTMLFileManagerFields;
+import org.drools.guvnor.server.util.FormData;
/**
* This is for dealing with assets that have an attachment (ie assets that are really an attachment).
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/files/FileManagerUtils.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
/*
* Copyright 2005 JBoss Inc
*
@@ -21,19 +21,19 @@
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.drools.brms.client.common.HTMLFileManagerFields;
-import org.drools.brms.server.ServiceImplementation;
-import org.drools.brms.server.builder.BRMSPackageBuilder;
-import org.drools.brms.server.builder.ContentPackageAssembler;
-import org.drools.brms.server.contenthandler.ContentHandler;
-import org.drools.brms.server.contenthandler.ContentManager;
-import org.drools.brms.server.contenthandler.IRuleAsset;
-import org.drools.brms.server.contenthandler.ModelContentHandler;
-import org.drools.brms.server.util.ClassicDRLImporter;
-import org.drools.brms.server.util.ClassicDRLImporter.Asset;
-import org.drools.brms.server.util.FormData;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.guvnor.client.common.HTMLFileManagerFields;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.builder.ContentPackageAssembler;
+import org.drools.guvnor.server.contenthandler.ContentHandler;
+import org.drools.guvnor.server.contenthandler.ContentManager;
+import org.drools.guvnor.server.contenthandler.IRuleAsset;
+import org.drools.guvnor.server.contenthandler.ModelContentHandler;
+import org.drools.guvnor.server.util.ClassicDRLImporter;
+import org.drools.guvnor.server.util.FormData;
+import org.drools.guvnor.server.util.ClassicDRLImporter.Asset;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/files/PackageDeploymentServlet.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
/*
* Copyright 2005 JBoss Inc
*
@@ -24,8 +24,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.drools.brms.server.util.FormData;
import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.server.util.FormData;
import org.drools.repository.RulesRepositoryException;
/**
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentURIHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/files/PackageDeploymentURIHelper.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentURIHelper.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
/*
* Copyright 2005 JBoss Inc
*
@@ -22,7 +22,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.drools.brms.client.common.Snapshot;
+import org.drools.guvnor.client.common.Snapshot;
/**
* Works out from the path URI what package is being requested.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryBackupServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/files/RepositoryBackupServlet.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryBackupServlet.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
/*
* Copyright 2005 JBoss Inc
*
@@ -27,7 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.drools.brms.server.util.FormData;
+import org.drools.guvnor.server.util.FormData;
import org.drools.repository.RulesRepository;
/**
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/files/RepositoryServlet.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryServlet.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,7 +20,7 @@
import javax.servlet.http.HttpServlet;
import org.apache.log4j.Logger;
-import org.drools.brms.server.util.TestEnvironmentSessionHelper;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.RulesRepository;
import org.jboss.seam.Component;
import org.jboss.seam.contexts.Contexts;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/files/RestAPIServlet.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
/*
* Copyright 2005 JBoss Inc
*
@@ -31,7 +31,7 @@
import org.apache.log4j.Logger;
import org.apache.util.Base64;
-import org.drools.brms.server.util.TestEnvironmentSessionHelper;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.RulesRepository;
import org.drools.repository.remoteapi.Response;
import org.drools.repository.remoteapi.RestAPI;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/WebDAVImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/files/WebDAVImpl.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/WebDAVImpl.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
import java.io.ByteArrayInputStream;
import java.io.File;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/WebdavServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/files/WebdavServlet.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/WebdavServlet.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
import java.io.File;
import java.io.IOException;
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/package.html (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/package.html)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/package.html (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/package.html 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,9 @@
+<body>
+ This package contains server side code for
+ the repository. This is to implement the RPC needs for the GWT based front end,
+ and application layer logic that uses the drools-repository back end (as a dependency).
+
+ The client package contains code that is used by GWT entirely in the front end (ie
+ it will be compiled to Javascript).
+
+</body>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/repository)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/BRMSRepositoryConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/repository/BRMSRepositoryConfiguration.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/BRMSRepositoryConfiguration.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.repository;
+package org.drools.guvnor.server.repository;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RulesRepositoryManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/repository/RulesRepositoryManager.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RulesRepositoryManager.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.repository;
+package org.drools.guvnor.server.repository;
/*
* Copyright 2005 JBoss Inc
*
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/security)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/security/DefaultAuthenticator.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.security;
+package org.drools.guvnor.server.security;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/security/NilAuthenticator.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.security;
+package org.drools.guvnor.server.security;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/security/SecurityServiceImpl.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.security;
+package org.drools.guvnor.server.security;
/*
* Copyright 2005 JBoss Inc
*
@@ -23,8 +23,8 @@
import javax.security.auth.login.LoginException;
import org.apache.log4j.Logger;
-import org.drools.brms.client.rpc.SecurityService;
-import org.drools.brms.client.rpc.UserSecurityContext;
+import org.drools.guvnor.client.rpc.SecurityService;
+import org.drools.guvnor.client.rpc.UserSecurityContext;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.remoting.WebRemote;
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/selector)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/Allow.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/selector/Allow.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/Allow.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.selector;
+package org.drools.guvnor.server.selector;
/**
* This is a simple named fact for the selectors.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/AssetSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/selector/AssetSelector.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/AssetSelector.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.selector;
+package org.drools.guvnor.server.selector;
import org.drools.repository.AssetItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/selector/RuleBasedSelector.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.selector;
+package org.drools.guvnor.server.selector;
import java.io.BufferedReader;
import java.io.IOException;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/selector/SelectorManager.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.selector;
+package org.drools.guvnor.server.selector;
import java.io.IOException;
import java.util.HashMap;
Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/util)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/util/BRMSSuggestionCompletionLoader.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
*
@@ -22,11 +22,11 @@
import java.util.List;
import java.util.jar.JarInputStream;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.server.ServiceImplementation;
-import org.drools.brms.server.builder.BRMSPackageBuilder;
-import org.drools.brms.server.rules.SuggestionCompletionLoader;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.rules.SuggestionCompletionLoader;
import org.drools.lang.dsl.DSLMappingFile;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/util/ClassicDRLImporter.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
*
@@ -30,9 +30,9 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.drools.brms.client.common.AssetFormats;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.client.common.AssetFormats;
import org.drools.lang.descr.RuleDescr;
/**
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/FormData.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/util/FormData.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/FormData.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/util/LoggingHelper.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import java.util.Date;
@@ -9,8 +9,8 @@
import org.apache.log4j.spi.ErrorHandler;
import org.apache.log4j.spi.Filter;
import org.apache.log4j.spi.LoggingEvent;
-import org.drools.brms.client.rpc.LogEntry;
-import org.drools.brms.server.ServiceImplementation;
+import org.drools.guvnor.client.rpc.LogEntry;
+import org.drools.guvnor.server.ServiceImplementation;
/**
* Collects messages for displaying in the GUI as well as providing a logger.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/MetaDataMapper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/util/MetaDataMapper.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/MetaDataMapper.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
*
@@ -24,7 +24,7 @@
import java.util.Iterator;
import java.util.Map;
-import org.drools.brms.client.rpc.MetaData;
+import org.drools.guvnor.client.rpc.MetaData;
import org.drools.repository.RulesRepositoryException;
/**
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/RowLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/util/RowLoader.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/RowLoader.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import java.io.BufferedReader;
import java.io.IOException;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TableDisplayHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/util/TableDisplayHandler.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TableDisplayHandler.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
@@ -22,9 +22,9 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.brms.client.rpc.TableConfig;
-import org.drools.brms.client.rpc.TableDataResult;
-import org.drools.brms.client.rpc.TableDataRow;
+import org.drools.guvnor.client.rpc.TableConfig;
+import org.drools.guvnor.client.rpc.TableDataResult;
+import org.drools.guvnor.client.rpc.TableDataRow;
import org.drools.repository.AssetItem;
import org.drools.repository.AssetItemIterator;
import org.drools.repository.AssetPageList;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/brms/server/util/TestEnvironmentSessionHelper.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/TestEnvironmentSessionHelper.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
*
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/brms/server/util/VerifierRunner.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -7,13 +7,13 @@
import java.util.Map;
import java.util.Set;
-import org.drools.brms.client.rpc.AnalysisFactUsage;
-import org.drools.brms.client.rpc.AnalysisFieldUsage;
-import org.drools.brms.client.rpc.AnalysisReport;
-import org.drools.brms.client.rpc.AnalysisReportLine;
-import org.drools.brms.client.rpc.DetailedSerializableException;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.client.rpc.AnalysisFactUsage;
+import org.drools.guvnor.client.rpc.AnalysisFieldUsage;
+import org.drools.guvnor.client.rpc.AnalysisReport;
+import org.drools.guvnor.client.rpc.AnalysisReportLine;
+import org.drools.guvnor.client.rpc.DetailedSerializableException;
import org.drools.lang.descr.PackageDescr;
import org.drools.verifier.Verifier;
import org.drools.verifier.components.VerifierClass;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/remoting/gwt/GWTToSeamAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/remoting/gwt/GWTToSeamAdapter.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/remoting/gwt/GWTToSeamAdapter.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -25,12 +25,12 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.drools.brms.client.rpc.DetailedSerializableException;
-import org.drools.brms.client.rpc.SecurityService;
-import org.drools.brms.client.rpc.SessionExpiredException;
-import org.drools.brms.server.ServiceImplementation;
-import org.drools.brms.server.security.SecurityServiceImpl;
-import org.drools.brms.server.util.TestEnvironmentSessionHelper;
+import org.drools.guvnor.client.rpc.DetailedSerializableException;
+import org.drools.guvnor.client.rpc.SecurityService;
+import org.drools.guvnor.client.rpc.SessionExpiredException;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.security.SecurityServiceImpl;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.RulesRepository;
import org.jboss.seam.Component;
import org.jboss.seam.annotations.remoting.WebRemote;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/resources/contenthandler.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/resources/contenthandler.properties 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/resources/contenthandler.properties 2008-06-19 01:48:27 UTC (rev 20604)
@@ -3,24 +3,24 @@
# Content Handler for Business Rule
-brl=org.drools.brms.server.contenthandler.BRLContentHandler
+brl=org.drools.guvnor.server.contenthandler.BRLContentHandler
# Content Handler for DSL Rule
-dslr=org.drools.brms.server.contenthandler.DSLRuleContentHandler
+dslr=org.drools.guvnor.server.contenthandler.DSLRuleContentHandler
# Content Handler for DRL Rule
-drl=org.drools.brms.server.contenthandler.DRLFileContentHandler
+drl=org.drools.guvnor.server.contenthandler.DRLFileContentHandler
# Content Handler for DSL Definition
-dsl=org.drools.brms.server.contenthandler.DSLDefinitionContentHandler
+dsl=org.drools.guvnor.server.contenthandler.DSLDefinitionContentHandler
# Content Handler for Function
-function=org.drools.brms.server.contenthandler.FunctionContentHandler
+function=org.drools.guvnor.server.contenthandler.FunctionContentHandler
# Content Handler for Model
-jar=org.drools.brms.server.contenthandler.ModelContentHandler
+jar=org.drools.guvnor.server.contenthandler.ModelContentHandler
# Content Handler for Decision Table
-xls=org.drools.brms.server.contenthandler.DecisionTableXLSHandler
+xls=org.drools.guvnor.server.contenthandler.DecisionTableXLSHandler
# Content Handler for Rule Flow
-rf=org.drools.brms.server.contenthandler.RuleFlowHandler
+rf=org.drools.guvnor.server.contenthandler.RuleFlowHandler
# Content Handler for Enumeration
-enumeration=org.drools.brms.server.contenthandler.EnumerationContentHandler
+enumeration=org.drools.guvnor.server.contenthandler.EnumerationContentHandler
# Content handler for scenario (its just text, not part of build)
-scenario=org.drools.brms.server.contenthandler.ScenarioContentHandler
+scenario=org.drools.guvnor.server.contenthandler.ScenarioContentHandler
# for guided decision tables
-gdst=org.drools.brms.server.contenthandler.GuidedDTContentHandler
\ No newline at end of file
+gdst=org.drools.guvnor.server.contenthandler.GuidedDTContentHandler
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/AsyncInterfaceTest.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/AsyncInterfaceTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/AsyncInterfaceTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/AsyncInterfaceTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,58 @@
+package org.drools.guvnor.client;
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+import java.lang.reflect.Method;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.client.rpc.RepositoryService;
+import org.drools.guvnor.client.rpc.RepositoryServiceAsync;
+import org.drools.guvnor.client.rpc.SecurityService;
+import org.drools.guvnor.client.rpc.SecurityServiceAsync;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+
+/**
+ * This will verify that the interfaces are kosher for GWT to use.
+ * @author Michael Neale
+ */
+public class AsyncInterfaceTest extends TestCase {
+
+ public void testService() throws Exception {
+
+ checkService( RepositoryService.class, RepositoryServiceAsync.class );
+ checkService( SecurityService.class, SecurityServiceAsync.class );
+
+ }
+
+ private void checkService(Class clsInt, Class clsAsync) throws NoSuchMethodException {
+ for ( Method m : clsInt.getMethods()) {
+
+ Class[] paramClasses = new Class[m.getParameterTypes().length + 1];
+ Class[] sourceParamClasses = m.getParameterTypes();
+ for ( int i = 0; i < sourceParamClasses.length; i++ ) {
+ paramClasses[i] = sourceParamClasses[i];
+ }
+ paramClasses[sourceParamClasses.length] = AsyncCallback.class;
+ assertNotNull(clsAsync.getMethod( m.getName(), paramClasses ));
+ }
+ }
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/common)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/common/AssetFormatsTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.common;
+package org.drools.guvnor.client.common;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,6 +17,8 @@
+import org.drools.guvnor.client.common.AssetFormats;
+
import junit.framework.TestCase;
public class AssetFormatsTest extends TestCase {
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/explorer)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/explorer/PackageHierarchyTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,7 +1,8 @@
-package org.drools.brms.client.explorer;
+package org.drools.guvnor.client.explorer;
-import org.drools.brms.client.explorer.PackageHierarchy.Folder;
-import org.drools.brms.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.explorer.PackageHierarchy;
+import org.drools.guvnor.client.explorer.PackageHierarchy.Folder;
+import org.drools.guvnor.client.rpc.PackageConfigData;
import junit.framework.TestCase;
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/HumanReadableTest.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/modeldriven/HumanReadableTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/HumanReadableTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/HumanReadableTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,54 @@
+package org.drools.guvnor.client.modeldriven;
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+import org.drools.guvnor.client.modeldriven.HumanReadable;
+
+import junit.framework.TestCase;
+
+public class HumanReadableTest extends TestCase {
+
+ public void testOperatorMapping() {
+
+ assertEquals("is not equal to", HumanReadable.getOperatorDisplayName("!="));
+ assertEquals("is equal to", HumanReadable.getOperatorDisplayName("=="));
+ assertEquals("xxx", HumanReadable.getOperatorDisplayName("xxx"));
+ assertEquals("sounds like", HumanReadable.getOperatorDisplayName("soundslike" ));
+ }
+
+ public void testCEMapping() {
+
+ assertEquals("There is no", HumanReadable.getCEDisplayName( "not" ));
+ assertEquals("There exists", HumanReadable.getCEDisplayName( "exists" ));
+ assertEquals("Any of", HumanReadable.getCEDisplayName( "or" ));
+ assertEquals("xxx", HumanReadable.getCEDisplayName( "xxx" ));
+
+ }
+
+ public void testActionMapping() {
+
+ assertEquals("Insert", HumanReadable.getActionDisplayName( "assert" ));
+ assertEquals("foo", HumanReadable.getActionDisplayName( "foo" ));
+ }
+
+
+
+
+
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/package.html (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/modeldriven/package.html)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/package.html (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/package.html 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,10 @@
+<body>
+This contains utilities and widgets for the model driven/scorecard style way of
+editing a rule.
+
+This has the interesting feature of being able to work over standard DRL, no special markup needed.
+Its actually a subset of DRL, complex structures and semantics can not be supported.
+
+However, this can be augmented with DSLs which can express any construct needed.
+
+</body>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/ui (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/modeldriven/ui)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/modeldriven/ui/ConstraintValueEditorTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditorTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,5 +1,7 @@
-package org.drools.brms.client.modeldriven.ui;
+package org.drools.guvnor.client.modeldriven.ui;
+import org.drools.guvnor.client.modeldriven.ui.ConstraintValueEditor;
+
import junit.framework.TestCase;
public class ConstraintValueEditorTest extends TestCase {
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/packages)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/packages/NewPackageWizardTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,5 +1,7 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
+import org.drools.guvnor.client.packages.PackageNameValidator;
+
import junit.framework.TestCase;
public class NewPackageWizardTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/packages/PackageHeaderWidgetTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/PackageHeaderWidgetTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,8 +1,9 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
-import org.drools.brms.client.packages.PackageHeaderWidget.Global;
-import org.drools.brms.client.packages.PackageHeaderWidget.Import;
-import org.drools.brms.client.packages.PackageHeaderWidget.Types;
+import org.drools.guvnor.client.packages.PackageHeaderWidget;
+import org.drools.guvnor.client.packages.PackageHeaderWidget.Global;
+import org.drools.guvnor.client.packages.PackageHeaderWidget.Import;
+import org.drools.guvnor.client.packages.PackageHeaderWidget.Types;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/packages/SuggestionCompletionCacheTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.packages;
+package org.drools.guvnor.client.packages;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,7 +19,8 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.packages.SuggestionCompletionCache;
import com.google.gwt.user.client.Command;
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/qa (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/qa)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/ScenarioHelperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/qa/ScenarioHelperTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/ScenarioHelperTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,16 +1,17 @@
-package org.drools.brms.client.qa;
+package org.drools.guvnor.client.qa;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.drools.brms.client.modeldriven.testing.ExecutionTrace;
-import org.drools.brms.client.modeldriven.testing.FactData;
-import org.drools.brms.client.modeldriven.testing.FieldData;
-import org.drools.brms.client.modeldriven.testing.Fixture;
-import org.drools.brms.client.modeldriven.testing.RetractFact;
-import org.drools.brms.client.modeldriven.testing.VerifyFact;
-import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
+import org.drools.guvnor.client.modeldriven.testing.FactData;
+import org.drools.guvnor.client.modeldriven.testing.FieldData;
+import org.drools.guvnor.client.modeldriven.testing.Fixture;
+import org.drools.guvnor.client.modeldriven.testing.RetractFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.guvnor.client.qa.ScenarioHelper;
import junit.framework.TestCase;
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/rpc)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/rpc/MetaDataTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rpc;
+package org.drools.guvnor.client.rpc;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,6 +17,8 @@
+import org.drools.guvnor.client.rpc.MetaData;
+
import junit.framework.TestCase;
public class MetaDataTest extends TestCase {
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/ruleeditor)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/ruleeditor/EditorLauncherTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.ruleeditor;
+package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,7 +17,8 @@
-import org.drools.brms.client.common.AssetFormats;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.ruleeditor.EditorLauncher;
import junit.framework.TestCase;
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rulelist (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/rulelist)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rulelist/TableDataRowTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/client/rulelist/TableDataRowTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rulelist/TableDataRowTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.rulelist;
+package org.drools.guvnor.client.rulelist;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,7 +19,7 @@
import junit.framework.TestCase;
-import org.drools.brms.client.rpc.TableDataRow;
+import org.drools.guvnor.client.rpc.TableDataRow;
public class TableDataRowTest extends TestCase {
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/PopulateDataTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,166 @@
+package org.drools.guvnor.server;
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.files.FileManagerUtils;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
+import org.drools.repository.AssetItem;
+import org.drools.repository.PackageItem;
+import org.drools.repository.RulesRepository;
+
+import com.google.gwt.user.client.rpc.SerializableException;
+
+/**
+ * This class will setup the data in a test state, which is
+ * good for screenshots/playing around.
+ *
+ * If you run this by itself, the database will be wiped, and left with only this data in it.
+ * If it is run as part of the suite, it will just augment the data.
+ *
+ * This sets up the data for a fictional company Billasurf, dealing with surfwear and equipment
+ * (for surfing, boarding etc).
+ *
+ * @author Michael Neale
+ */
+public class PopulateDataTest extends TestCase {
+
+ public void testPopulate() throws Exception {
+ ServiceImplementation serv = new ServiceImplementation();
+ serv.repository = new RulesRepository(TestEnvironmentSessionHelper.getSession());
+
+ createCategories( serv );
+ createStates( serv );
+ createPackages( serv );
+ createModel( serv );
+
+ createSomeRules( serv );
+ createPackageSnapshots( serv );
+
+ }
+
+ private void createModel(ServiceImplementation serv) throws Exception {
+ RulesRepository repo = serv.repository;
+ String uuid = serv.createNewRule( "DomainModel", "This is the business object model", null, "com.billasurf.manufacturing.plant", AssetFormats.MODEL );
+ InputStream file = this.getClass().getResourceAsStream( "/billasurf.jar" );
+ assertNotNull(file);
+
+ FileManagerUtils fm = new FileManagerUtils();
+ fm.repository = repo;
+
+ fm.attachFileToAsset( uuid, file, "billasurf.jar" );
+
+ AssetItem item = repo.loadAssetByUUID( uuid );
+ assertNotNull(item.getBinaryContentAsBytes());
+ assertEquals( item.getBinaryContentAttachmentFileName(), "billasurf.jar" );
+
+
+ PackageItem pkg = repo.loadPackage( "com.billasurf.manufacturing.plant" );
+ ServiceImplementation.updateDroolsHeader( "import com.billasurf.Board\nimport com.billasurf.Person" +
+ "\n\nglobal com.billasurf.Person prs", pkg );
+ pkg.checkin( "added imports" );
+
+ SuggestionCompletionEngine eng = serv.loadSuggestionCompletionEngine( "com.billasurf.manufacturing.plant" );
+ assertNotNull(eng);
+
+ assertEquals(2, eng.factTypes.length);
+ String[] fields = (String[]) eng.fieldsForType.get( "Board" );
+ assertTrue(fields.length == 3);
+
+ String[] globalVars = eng.getGlobalVariables();
+ assertEquals(1, globalVars.length);
+ assertEquals("prs", globalVars[0]);
+ assertEquals(2, eng.getFieldCompletionsForGlobalVariable( "prs" ).length);
+
+ fields = (String[]) eng.fieldsForType.get( "Person" );
+
+ assertTrue(fields.length == 2);
+
+
+
+
+ }
+
+ private void createPackageSnapshots(ServiceImplementation serv) {
+ serv.createPackageSnapshot( "com.billasurf.manufacturing", "TEST", false, "The testing region." );
+ serv.createPackageSnapshot( "com.billasurf.manufacturing", "PRODUCTION", false, "The testing region." );
+ serv.createPackageSnapshot( "com.billasurf.manufacturing", "PRODUCTION ROLLBACK", false, "The testing region." );
+
+ }
+
+ private void createSomeRules(ServiceImplementation serv) throws SerializableException {
+ String uuid = serv.createNewRule( "Surfboard_Colour_Combination", "allowable combinations for basic boards.", "Manufacturing/Boards", "com.billasurf.manufacturing", AssetFormats.BUSINESS_RULE );
+ serv.changeState( uuid, "Pending", false );
+ uuid = serv.createNewRule( "Premium_Colour_Combinations", "This defines XXX.", "Manufacturing/Boards", "com.billasurf.manufacturing", AssetFormats.BUSINESS_RULE );
+ serv.changeState( uuid, "Approved", false );
+ uuid = serv.createNewRule( "Fibreglass supplier selection", "This defines XXX.", "Manufacturing/Boards", "com.billasurf.manufacturing", AssetFormats.BUSINESS_RULE );
+ uuid = serv.createNewRule( "Recommended wax", "This defines XXX.", "Manufacturing/Boards", "com.billasurf.manufacturing", AssetFormats.BUSINESS_RULE );
+ uuid = serv.createNewRule( "SomeDSL", "Ignore me.", "Manufacturing/Boards", "com.billasurf.manufacturing", AssetFormats.DSL );
+
+
+
+
+ }
+
+ private void createPackages(ServiceImplementation serv) throws SerializableException {
+ String uuid = serv.createPackage( "com.billasurf.manufacturing", "Rules for manufacturing." );
+
+ PackageConfigData conf = serv.loadPackageConfig( uuid );
+ conf.header = "import com.billasurf.manuf.materials.*";
+ serv.savePackage( conf );
+
+ serv.createPackage( "com.billasurf.manufacturing.plant", "Rules for manufacturing plants." );
+ serv.createPackage( "com.billasurf.finance", "All financial rules." );
+ serv.createPackage( "com.billasurf.hrman", "Rules for in house HR application." );
+ serv.createPackage( "com.billasurf.sales", "Rules exposed as a service for pricing, and discounting." );
+
+ }
+
+ private void createStates(ServiceImplementation serv) throws SerializableException {
+ serv.createState( "Approved" );
+ serv.createState( "Pending" );
+ }
+
+ private void createCategories(ServiceImplementation serv) {
+ serv.createCategory( "/", "HR", "" );
+ serv.createCategory( "/", "Sales", "" );
+ serv.createCategory( "/", "Manufacturing", "" );
+ serv.createCategory( "/", "Finance", "" );
+
+ serv.createCategory( "HR", "Leave", "" );
+ serv.createCategory( "HR", "Training", "" );
+ serv.createCategory( "Sales", "Promotions", "" );
+ serv.createCategory( "Sales", "Old promotions", "" );
+ serv.createCategory( "Sales", "Boogie boards", "" );
+ serv.createCategory( "Sales", "Surf boards", "" );
+ serv.createCategory( "Sales", "Surf wear", "" );
+ serv.createCategory( "Manufacturing", "Surf wear", "" );
+ serv.createCategory( "Manufacturing", "Boards", "" );
+ serv.createCategory( "Finance", "Employees", "" );
+ serv.createCategory( "Finance", "Payables", "" );
+ serv.createCategory( "Finance", "Receivables", "" );
+ }
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/ServiceImplementationTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -0,0 +1,2010 @@
+package org.drools.guvnor.server;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.drools.Person;
+import org.drools.RuleBase;
+import org.drools.StatelessSession;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
+import org.drools.guvnor.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
+import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
+import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
+import org.drools.guvnor.client.modeldriven.testing.FactData;
+import org.drools.guvnor.client.modeldriven.testing.FieldData;
+import org.drools.guvnor.client.modeldriven.testing.Scenario;
+import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
+import org.drools.guvnor.client.modeldriven.testing.VerifyField;
+import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.guvnor.client.rpc.AnalysisReport;
+import org.drools.guvnor.client.rpc.BuilderResult;
+import org.drools.guvnor.client.rpc.BulkTestRunResult;
+import org.drools.guvnor.client.rpc.DetailedSerializableException;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryService;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.RuleContentText;
+import org.drools.guvnor.client.rpc.ScenarioResultSummary;
+import org.drools.guvnor.client.rpc.ScenarioRunResult;
+import org.drools.guvnor.client.rpc.SnapshotInfo;
+import org.drools.guvnor.client.rpc.TableConfig;
+import org.drools.guvnor.client.rpc.TableDataResult;
+import org.drools.guvnor.client.rpc.TableDataRow;
+import org.drools.guvnor.client.rpc.ValidatedResponse;
+import org.drools.guvnor.client.rulelist.AssetItemGrid;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.util.BRXMLPersistence;
+import org.drools.guvnor.server.util.IO;
+import org.drools.guvnor.server.util.ScenarioXMLPersistence;
+import org.drools.guvnor.server.util.TableDisplayHandler;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
+import org.drools.repository.AssetItem;
+import org.drools.repository.CategoryItem;
+import org.drools.repository.PackageItem;
+import org.drools.repository.RulesRepository;
+import org.drools.repository.RulesRepositoryException;
+import org.drools.repository.StateItem;
+import org.drools.rule.Package;
+import org.drools.util.BinaryRuleBaseLoader;
+import org.drools.util.DroolsStreamUtils;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+import com.google.gwt.user.client.rpc.SerializableException;
+
+/**
+ * This is really a collection of integration tests.
+ * @author Michael Neale
+ */
+public class ServiceImplementationTest extends TestCase {
+
+ public void testCategory() throws Exception {
+
+ RepositoryService impl = getService();
+
+ String[] originalCats = impl.loadChildCategories("/");
+
+ Boolean result = impl.createCategory("/", "TopLevel1", "a description");
+ assertTrue(result.booleanValue());
+
+ result = impl.createCategory("/", "TopLevel2", "a description");
+ assertTrue(result.booleanValue());
+
+ String[] cats = impl.loadChildCategories("/");
+ assertTrue(cats.length == originalCats.length + 2);
+
+ result = impl.createCategory("", "Top3", "description");
+ assertTrue(result.booleanValue());
+
+ result = impl.createCategory(null, "Top4", "description");
+ assertTrue(result.booleanValue());
+
+ }
+
+ public void testDeleteUnversionedRule() throws Exception {
+ ServiceImplementation impl = getService();
+
+ impl.repository.loadDefaultPackage();
+ impl.repository.createPackage("anotherPackage", "woot");
+
+ CategoryItem cat = impl.repository.loadCategory("/");
+ cat.addCategory("testDeleteUnversioned", "yeah");
+
+ String uuid = impl.createNewRule("test Delete Unversioned",
+ "a description", "testDeleteUnversioned", "anotherPackage",
+ "txt");
+ assertNotNull(uuid);
+ assertFalse("".equals(uuid));
+
+ AssetItem localItem = impl.repository.loadAssetByUUID(uuid);
+
+ // String drl = "package org.drools.repository\n\ndialect 'mvel'\n\n" +
+ // "rule Rule1 \n when \n AssetItem(description != null) \n then \n
+ // System.out.println(\"yeah\");\nend";
+ // RuleBase rb = RuleBaseLoader.getInstance().loadFromReader(new
+ // StringReader(drl));
+ // rb.newStatelessSession().execute(localItem);
+
+ assertEquals("test Delete Unversioned", localItem.getName());
+
+ localItem.remove();
+ impl.repository.save();
+
+ try {
+ localItem = impl.repository.loadAssetByUUID(uuid);
+ fail();
+ } catch (Exception e) {
+ }
+ }
+
+ public void testAddRuleAndListPackages() throws Exception {
+ // ServiceImpl impl = new ServiceImpl(new
+ // RulesRepository(SessionHelper.getSession()));
+
+ ServiceImplementation impl = getService();
+
+ impl.repository.loadDefaultPackage();
+ impl.repository.createPackage("another", "woot");
+
+ CategoryItem cat = impl.repository.loadCategory("/");
+ cat.addCategory("testAddRule", "yeah");
+
+ String result = impl.createNewRule("test AddRule", "a description",
+ "testAddRule", "another", "txt");
+ assertNotNull(result);
+ assertFalse("".equals(result));
+
+ PackageConfigData[] packages = impl.listPackages();
+ assertTrue(packages.length > 0);
+
+ boolean found = false;
+ for (int i = 0; i < packages.length; i++) {
+ if (packages[i].name.equals("another")) {
+ found = true;
+ }
+ }
+
+ assertTrue(found);
+
+ assertFalse(packages[0].uuid == null);
+ assertFalse(packages[0].uuid.equals(""));
+
+ // just for performance testing with scaling up numbers of rules
+ // for (int i=1; i <= 1000; i++) {
+ // impl.createNewRule( "somerule_" + i, "description",
+ // "testAddRule", "another", "drl" );
+ // }
+
+ result = impl
+ .createNewRule("testDTSample", "a description", "testAddRule",
+ "another", AssetFormats.DECISION_SPREADSHEET_XLS);
+ AssetItem dtItem = impl.repository.loadAssetByUUID(result);
+ assertNotNull(dtItem.getBinaryContentAsBytes());
+ assertTrue(dtItem.getBinaryContentAttachmentFileName().endsWith(".xls"));
+ }
+
+ public void testAttemptDupeRule() throws Exception {
+ ServiceImplementation impl = getService();
+ CategoryItem cat = impl.repository.loadCategory("/");
+ cat.addCategory("testAttemptDupeRule", "yeah");
+
+ impl.repository.createPackage("dupes", "yeah");
+
+ impl.createNewRule("testAttemptDupeRule", "ya", "testAttemptDupeRule",
+ "dupes", "rule");
+
+ String uuid = impl.createNewRule("testAttemptDupeRule", "ya",
+ "testAttemptDupeRule", "dupes", "rule");
+ assertEquals("DUPLICATE", uuid);
+
+ }
+
+ public void testCreateNewRule() throws Exception {
+ ServiceImplementation impl = getService();
+ impl.repository.createPackage("testCreateNewRule", "desc");
+ impl.createCategory("", "testCreateNewRule", "this is a cat");
+
+ String uuid = impl.createNewRule("testCreateNewRuleName",
+ "an initial desc", "testCreateNewRule", "testCreateNewRule",
+ AssetFormats.DSL_TEMPLATE_RULE);
+ assertNotNull(uuid);
+ assertFalse("".equals(uuid));
+
+ AssetItem dtItem = impl.repository.loadAssetByUUID(uuid);
+ assertEquals(dtItem.getDescription(), "an initial desc");
+ }
+
+ public void testCreateNewRuleContainsApostrophe() throws Exception {
+ ServiceImplementation impl = getService();
+ impl.repository.createPackage("testCreateNewRuleContainsApostrophe",
+ "desc");
+ impl.createCategory("", "testCreateNewRuleContainsApostrophe",
+ "this is a cat");
+
+ try {
+ impl.createNewRule("testCreateNewRuleContains' character",
+ "an initial desc", "testCreateNewRuleContainsApostrophe",
+ "testCreateNewRuleContainsApostrophe",
+ AssetFormats.DSL_TEMPLATE_RULE);
+ fail("did not get expected exception");
+ } catch (SerializableException e) {
+ assertTrue(e
+ .getMessage()
+ .indexOf(
+ "'testCreateNewRuleContains' character' is not a valid path. ''' not a valid name character") >= 0);
+ }
+ }
+
+ public void testRuleTableLoad() throws Exception {
+ ServiceImplementation impl = getService();
+ TableConfig conf = impl
+ .loadTableConfig(AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertNotNull(conf.headers);
+
+ CategoryItem cat = impl.repository.loadCategory("/");
+ cat.addCategory("testRuleTableLoad", "yeah");
+
+ impl.repository.createPackage("testRuleTableLoad", "yeah");
+ impl.createNewRule("testRuleTableLoad", "ya", "testRuleTableLoad",
+ "testRuleTableLoad", "rule");
+ impl.createNewRule("testRuleTableLoad2", "ya", "testRuleTableLoad",
+ "testRuleTableLoad", "rule");
+
+ TableDataResult result = impl
+ .loadRuleListForCategories("testRuleTableLoad", 0, -1, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(2, result.data.length);
+
+ String key = result.data[0].id;
+ assertFalse(key.startsWith("testRule"));
+
+ assertEquals(result.data[0].format, "rule");
+
+
+ assertTrue(result.data[0].values[0].startsWith("testRuleTableLoad"));
+ }
+
+ public void testDateFormatting() throws Exception {
+ Calendar cal = Calendar.getInstance();
+ TableDisplayHandler handler = new TableDisplayHandler(
+ AssetItemGrid.RULE_LIST_TABLE_ID);
+ String fmt = handler.formatDate(cal);
+ assertNotNull(fmt);
+
+ assertTrue(fmt.length() > 8);
+ }
+
+ public void testLoadRuleAsset() throws Exception {
+ ServiceImplementation impl = getService();
+ impl.repository.createPackage("testLoadRuleAsset", "desc");
+ impl.createCategory("", "testLoadRuleAsset", "this is a cat");
+
+ impl.createNewRule("testLoadRuleAsset", "description",
+ "testLoadRuleAsset", "testLoadRuleAsset", "drl");
+
+ TableDataResult res = impl
+ .loadRuleListForCategories("testLoadRuleAsset", 0, -1, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(1, res.data.length);
+ assertEquals(1, res.total);
+ assertFalse(res.hasNext);
+
+ TableDataRow row = res.data[0];
+ String uuid = row.id;
+
+ RuleAsset asset = impl.loadRuleAsset(uuid);
+ assertNotNull(asset);
+
+ assertEquals(uuid, asset.uuid);
+
+ assertEquals("description", asset.metaData.description);
+
+ assertNotNull(asset.content);
+ assertTrue(asset.content instanceof RuleContentText);
+ assertEquals("testLoadRuleAsset", asset.metaData.name);
+ assertEquals("testLoadRuleAsset", asset.metaData.title);
+ assertEquals("testLoadRuleAsset", asset.metaData.packageName);
+ assertEquals("drl", asset.metaData.format);
+ assertNotNull(asset.metaData.createdDate);
+
+ assertEquals(1, asset.metaData.categories.length);
+ assertEquals("testLoadRuleAsset", asset.metaData.categories[0]);
+
+ AssetItem rule = impl.repository.loadPackage("testLoadRuleAsset")
+ .loadAsset("testLoadRuleAsset");
+ impl.repository.createState("whee");
+ rule.updateState("whee");
+ rule.checkin("changed state");
+ asset = impl.loadRuleAsset(uuid);
+
+ assertEquals("whee", asset.metaData.status);
+ assertEquals("changed state", asset.metaData.checkinComment);
+
+ uuid = impl.createNewRule("testBRLFormatSugComp", "description",
+ "testLoadRuleAsset", "testLoadRuleAsset",
+ AssetFormats.BUSINESS_RULE);
+ asset = impl.loadRuleAsset(uuid);
+ assertTrue(asset.content instanceof RuleModel);
+
+ uuid = impl.createNewRule("testLoadRuleAssetBRL", "description",
+ "testLoadRuleAsset", "testLoadRuleAsset",
+ AssetFormats.DSL_TEMPLATE_RULE);
+ asset = impl.loadRuleAsset(uuid);
+ assertTrue(asset.content instanceof RuleContentText);
+ }
+
+ public void testLoadAssetHistoryAndRestore() throws Exception {
+ ServiceImplementation impl = getService();
+ impl.repository.createPackage("testLoadAssetHistory", "desc");
+ impl.createCategory("", "testLoadAssetHistory", "this is a cat");
+
+ String uuid = impl.createNewRule("testLoadAssetHistory", "description",
+ "testLoadAssetHistory", "testLoadAssetHistory", "drl");
+ RuleAsset asset = impl.loadRuleAsset(uuid);
+ impl.checkinVersion(asset); // 1
+ asset = impl.loadRuleAsset(uuid);
+ impl.checkinVersion(asset); // 2
+ asset = impl.loadRuleAsset(uuid);
+ impl.checkinVersion(asset); // HEAD
+
+ TableDataResult result = impl.loadAssetHistory(uuid);
+ assertNotNull(result);
+ TableDataRow[] rows = result.data;
+ assertEquals(2, rows.length);
+ assertFalse(rows[0].id.equals(uuid));
+ assertFalse(rows[1].id.equals(uuid));
+
+ RuleAsset old = impl.loadRuleAsset(rows[0].id);
+ RuleAsset newer = impl.loadRuleAsset(rows[1].id);
+ assertFalse(old.metaData.versionNumber == newer.metaData.versionNumber);
+
+ RuleAsset head = impl.loadRuleAsset(uuid);
+
+ long oldVersion = old.metaData.versionNumber;
+ assertFalse(oldVersion == head.metaData.versionNumber);
+
+ impl.restoreVersion(old.uuid, head.uuid, "this was cause of a mistake");
+
+ RuleAsset newHead = impl.loadRuleAsset(uuid);
+
+ assertEquals("this was cause of a mistake",
+ newHead.metaData.checkinComment);
+
+ }
+
+ public void testCheckin() throws Exception {
+ RepositoryService serv = getService();
+
+ serv.listPackages();
+
+ serv
+ .createCategory("/", "testCheckinCategory",
+ "this is a description");
+ serv.createCategory("/", "testCheckinCategory2",
+ "this is a description");
+ serv.createCategory("testCheckinCategory", "deeper", "description");
+
+ String uuid = serv.createNewRule("testChecking",
+ "this is a description", "testCheckinCategory",
+ RulesRepository.DEFAULT_PACKAGE, "drl");
+
+ RuleAsset asset = serv.loadRuleAsset(uuid);
+
+ assertNotNull(asset.metaData.lastModifiedDate);
+
+ asset.metaData.coverage = "boo";
+ asset.content = new RuleContentText();
+ ((RuleContentText) asset.content).content = "yeah !";
+
+ Date start = new Date();
+ Thread.sleep(100);
+
+ String uuid2 = serv.checkinVersion(asset);
+ assertEquals(uuid, uuid2);
+
+ RuleAsset asset2 = serv.loadRuleAsset(uuid);
+ assertNotNull(asset2.metaData.lastModifiedDate);
+ assertTrue(asset2.metaData.lastModifiedDate.after(start));
+
+ assertEquals("boo", asset2.metaData.coverage);
+ assertEquals(1, asset2.metaData.versionNumber);
+
+ assertEquals("yeah !", ((RuleContentText) asset2.content).content);
+
+ asset2.metaData.coverage = "ya";
+ asset2.metaData.checkinComment = "checked in";
+
+ String cat = asset2.metaData.categories[0];
+ asset2.metaData.categories = new String[3];
+ asset2.metaData.categories[0] = cat;
+ asset2.metaData.categories[1] = "testCheckinCategory2";
+ asset2.metaData.categories[2] = "testCheckinCategory/deeper";
+
+ serv.checkinVersion(asset2);
+
+ asset2 = serv.loadRuleAsset(uuid);
+ assertEquals("ya", asset2.metaData.coverage);
+ assertEquals(2, asset2.metaData.versionNumber);
+ assertEquals("checked in", asset2.metaData.checkinComment);
+ assertEquals(3, asset2.metaData.categories.length);
+ assertEquals("testCheckinCategory", asset2.metaData.categories[0]);
+ assertEquals("testCheckinCategory2", asset2.metaData.categories[1]);
+ assertEquals("testCheckinCategory/deeper",
+ asset2.metaData.categories[2]);
+
+ // now lets try a concurrent edit of an asset.
+ // asset3 will be loaded and edited, and then asset2 will try to
+ // clobber, it, which should fail.
+ // as it is optimistically locked.
+ RuleAsset asset3 = serv.loadRuleAsset(asset2.uuid);
+ asset3.metaData.subject = "new sub";
+ serv.checkinVersion(asset3);
+
+ asset3 = serv.loadRuleAsset(asset2.uuid);
+ assertFalse(asset3.metaData.versionNumber == asset2.metaData.versionNumber);
+
+ String result = serv.checkinVersion(asset2);
+ assertTrue(result.startsWith("ERR"));
+ System.err.println(result.substring(5));
+
+ }
+
+ public void testArchivePackage() throws Exception {
+ ServiceImplementation impl = getService();
+
+ PackageConfigData[] pkgs = impl.listPackages();
+
+ PackageConfigData[] arch = impl.listArchivedPackages();
+
+ String uuid = impl.createPackage("testCreateArchivedPackage",
+ "this is a new package");
+
+
+ PackageItem item = impl.repository
+ .loadPackage("testCreateArchivedPackage");
+ TableDataResult td = impl.loadArchivedAssets(0, 1000);
+
+ item.archiveItem(true);
+
+
+
+ TableDataResult td2 = impl.loadArchivedAssets(0, 1000);
+ assertEquals(td2.data.length, td.data.length);
+
+ PackageConfigData[] arch2 = impl.listArchivedPackages();
+ assertEquals(arch2.length, arch.length + 1);
+
+
+
+ assertEquals(pkgs.length, impl.listPackages().length);
+
+ item.archiveItem(false);
+ arch2 = impl.listArchivedPackages();
+ assertEquals(arch2.length, arch.length);
+ }
+
+ public void testCreatePackage() throws Exception {
+ ServiceImplementation impl = getService();
+ PackageConfigData[] pkgs = impl.listPackages();
+ String uuid = impl.createPackage("testCreatePackage",
+ "this is a new package");
+ assertNotNull(uuid);
+
+ PackageItem item = impl.repository.loadPackage("testCreatePackage");
+ assertNotNull(item);
+ assertEquals("this is a new package", item.getDescription());
+
+ assertEquals(pkgs.length + 1, impl.listPackages().length);
+
+ PackageConfigData conf = impl.loadPackageConfig(uuid);
+ assertEquals("this is a new package", conf.description);
+ assertNotNull(conf.lastModified);
+
+ pkgs = impl.listPackages();
+
+ impl.copyPackage("testCreatePackage", "testCreatePackage_COPY");
+
+ assertEquals(pkgs.length + 1, impl.listPackages().length);
+ try {
+ impl.copyPackage("testCreatePackage", "testCreatePackage_COPY");
+ } catch (RulesRepositoryException e) {
+ assertNotNull(e.getMessage());
+ }
+ }
+
+ public void testLoadPackageConfig() throws Exception {
+ ServiceImplementation impl = getService();
+ PackageItem it = impl.repository.loadDefaultPackage();
+ String uuid = it.getUUID();
+ it.updateCoverage("xyz");
+ it.updateExternalURI("ext");
+ ServiceImplementation.updateDroolsHeader("header", it);
+ impl.repository.save();
+
+ PackageConfigData data = impl.loadPackageConfig(uuid);
+ assertNotNull(data);
+
+ assertEquals(RulesRepository.DEFAULT_PACKAGE, data.name);
+ assertEquals("header", data.header);
+ assertEquals("ext", data.externalURI);
+
+ assertNotNull(data.uuid);
+ assertFalse(data.isSnapshot);
+
+ assertNotNull(data.dateCreated);
+ Date original = data.lastModified;
+
+ Thread.sleep(100);
+
+ impl.createPackageSnapshot(RulesRepository.DEFAULT_PACKAGE,
+ "TEST SNAP 2.0", false, "ya");
+ PackageItem loaded = impl.repository.loadPackageSnapshot(
+ RulesRepository.DEFAULT_PACKAGE, "TEST SNAP 2.0");
+
+ data = impl.loadPackageConfig(loaded.getUUID());
+ assertTrue(data.isSnapshot);
+ assertEquals("TEST SNAP 2.0", data.snapshotName);
+ assertFalse(original.equals(data.lastModified));
+ assertEquals("ya", data.checkinComment);
+ }
+
+ public void testPackageConfSave() throws Exception {
+ RepositoryService impl = getService();
+ String uuid = impl.createPackage("testPackageConfSave", "a desc");
+ PackageConfigData data = impl.loadPackageConfig(uuid);
+
+ data.description = "new desc";
+ data.header = "wa";
+ data.externalURI = "new URI";
+
+ ValidatedResponse res = impl.savePackage(data);
+ assertNotNull(res);
+ assertTrue(res.hasErrors);
+ assertNotNull(res.errorMessage);
+
+ data = impl.loadPackageConfig(uuid);
+ assertEquals("new desc", data.description);
+ assertEquals("wa", data.header);
+ assertEquals("new URI", data.externalURI);
+
+ data.header = "";
+ res = impl.savePackage(data);
+ if (res.hasErrors) {
+ System.out
+ .println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ System.out.println(res.errorMessage);
+ System.out
+ .println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+
+ }
+
+ assertFalse(res.hasErrors);
+ }
+
+ public void testListByFormat() throws Exception {
+ RepositoryService impl = getService();
+ String cat = "testListByFormat";
+ impl.createCategory("/", cat, "ya");
+ String pkgUUID = impl.createPackage("testListByFormat",
+ "used for listing by format.");
+
+ String uuid = impl.createNewRule("testListByFormat", "x", cat,
+ "testListByFormat", "testListByFormat");
+ String uuid2 = impl.createNewRule("testListByFormat2", "x", cat,
+ "testListByFormat", "testListByFormat");
+ String uuid3 = impl.createNewRule("testListByFormat3", "x", cat,
+ "testListByFormat", "testListByFormat");
+ String uuid4 = impl.createNewRule("testListByFormat4", "x", cat,
+ "testListByFormat", "testListByFormat");
+
+ TableDataResult res = impl.listAssets(pkgUUID, arr("testListByFormat"),
+ 0, -1, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(4, res.data.length);
+ assertEquals(uuid, res.data[0].id);
+ assertEquals("testListByFormat", res.data[0].values[0]);
+
+ res = impl.listAssets(pkgUUID, arr("testListByFormat"), 0, 4, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(4, res.data.length);
+
+ res = impl.listAssets(pkgUUID, arr("testListByFormat"), 0, 2, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(2, res.data.length);
+ assertEquals(uuid, res.data[0].id);
+ assertEquals(4, res.total);
+ assertTrue(res.hasNext);
+
+ res = impl.listAssets(pkgUUID, arr("testListByFormat"), 2, 2, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(2, res.data.length);
+ assertEquals(uuid3, res.data[0].id);
+ assertEquals(4, res.total);
+ assertFalse(res.hasNext);
+
+ uuid = impl.createNewRule("testListByFormat5", "x", cat,
+ "testListByFormat", "otherFormat");
+
+ res = impl.listAssets(pkgUUID, arr("otherFormat"), 0, 40, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(1, res.data.length);
+ assertEquals(uuid, res.data[0].id);
+
+ res = impl.listAssets(pkgUUID, new String[] { "otherFormat",
+ "testListByFormat" }, 0, 40, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(5, res.data.length);
+
+ TableDataResult result = impl.quickFindAsset("testListByForma", 5,
+ false);
+ assertEquals(5, result.data.length);
+
+ assertNotNull(result.data[0].id);
+ assertTrue(result.data[0].values[0].startsWith("testListByFormat"));
+
+ result = impl.quickFindAsset("testListByForma", 3, false);
+ assertEquals(4, result.data.length);
+
+ assertEquals("MORE", result.data[3].id);
+
+ }
+
+
+ public void testQuickFind() throws Exception {
+ RepositoryService impl = getService();
+ String cat = "testQuickFind";
+ impl.createCategory("/", cat, "qkfnd");
+ impl.createPackage("testQuickFind",
+ "for testing quick find.");
+ String uuid = impl.createNewRule("testQuickFindmyRule1", "desc", cat, "testQuickFind", "drl");
+ TableDataResult res = impl.quickFindAsset("testQuickFindmyRule", 20, false);
+ assertEquals(1, res.data.length);
+
+ impl.createNewRule("testQuickFindmyRule2", "desc", cat, "testQuickFind", "drl");
+ res = impl.quickFindAsset("testQuickFindmyRule", 20, false);
+ assertEquals(2, res.data.length);
+
+ impl.copyAsset(uuid, "testQuickFind", "testQuickFindmyRule3");
+ res = impl.quickFindAsset("testQuickFindmyRule", 20, false);
+ assertEquals(3, res.data.length);
+
+
+
+ }
+
+
+ public String[] arr(String s) {
+ return new String[] { s };
+ }
+
+ public void testStatus() throws Exception {
+ RepositoryService impl = getService();
+ String uuid = impl.createState("testStatus1");
+ assertNotNull(uuid);
+
+ String[] states = impl.listStates();
+ assertTrue(states.length > 0);
+
+ impl.createState("testStatus2");
+ String[] states2 = impl.listStates();
+ assertEquals(states.length + 1, states2.length);
+
+ int match = 0;
+ for (int i = 0; i < states2.length; i++) {
+ if (states2[i].equals("testStatus2")) {
+ match++;
+ } else if (states2[i].equals("testStatus1")) {
+ match++;
+ }
+ }
+
+ assertEquals(2, match);
+
+ String packagUUID = impl.createPackage("testStatus", "description");
+ String ruleUUID = impl.createNewRule("testStatus", "desc", null,
+ "testStatus", "drl");
+ String ruleUUID2 = impl.createNewRule("testStatus2", "desc", null,
+ "testStatus", "drl");
+ impl.createState("testState");
+
+ RuleAsset asset = impl.loadRuleAsset(ruleUUID);
+ assertEquals(StateItem.DRAFT_STATE_NAME, asset.metaData.status);
+ impl.changeState(ruleUUID, "testState", false);
+ asset = impl.loadRuleAsset(ruleUUID);
+ assertEquals("testState", asset.metaData.status);
+ asset = impl.loadRuleAsset(ruleUUID2);
+ assertEquals(StateItem.DRAFT_STATE_NAME, asset.metaData.status);
+
+ impl.createState("testState2");
+ impl.changeState(packagUUID, "testState2", true);
+
+ PackageConfigData pkg = impl.loadPackageConfig(packagUUID);
+ assertEquals("testState2", pkg.state);
+
+ asset = impl.loadRuleAsset(ruleUUID2);
+ assertEquals("testState2", asset.metaData.status);
+
+ impl.checkinVersion(asset);
+ asset = impl.loadRuleAsset(asset.uuid);
+ assertEquals("testState2", asset.metaData.status);
+
+ }
+
+ public void testMovePackage() throws Exception {
+ RepositoryService impl = getService();
+ String[] cats = impl.loadChildCategories("/");
+ if (cats.length == 0) {
+ impl.createCategory("/", "la", "d");
+ }
+ String sourcePkgId = impl.createPackage("sourcePackage", "description");
+ String destPkgId = impl.createPackage("targetPackage", "description");
+
+ String cat = impl.loadChildCategories("/")[0];
+
+ String uuid = impl.createNewRule("testMovePackage", "desc", cat,
+ "sourcePackage", "drl");
+
+ TableDataResult res = impl.listAssets(destPkgId,
+ new String[] { "drl" }, 0, 2, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(0, res.data.length);
+
+ impl.changeAssetPackage(uuid, "targetPackage", "yeah");
+ res = impl.listAssets(destPkgId, new String[] { "drl" }, 0, 2, AssetItemGrid.RULE_LIST_TABLE_ID);
+
+ assertEquals(1, res.data.length);
+
+ res = impl.listAssets(sourcePkgId, new String[] { "drl" }, 0, 2,AssetItemGrid.RULE_LIST_TABLE_ID);
+
+ assertEquals(0, res.data.length);
+
+ }
+
+ public void testCopyAsset() throws Exception {
+ RepositoryService impl = getService();
+ impl.createCategory("/", "templates", "ya");
+ String uuid = impl.createNewRule("testCopyAsset", "", "templates",
+ RulesRepository.DEFAULT_PACKAGE, "drl");
+ String uuid2 = impl.copyAsset(uuid, RulesRepository.DEFAULT_PACKAGE,
+ "testCopyAsset2");
+ assertNotSame(uuid, uuid2);
+
+ RuleAsset asset = impl.loadRuleAsset(uuid2);
+ assertNotNull(asset);
+ assertEquals(RulesRepository.DEFAULT_PACKAGE,
+ asset.metaData.packageName);
+ assertEquals("testCopyAsset2", asset.metaData.name);
+ }
+
+ public void testSnapshot() throws Exception {
+ RepositoryService impl = getService();
+ impl.createCategory("/", "snapshotTesting", "y");
+ impl.createPackage("testSnapshot", "d");
+ String uuid = impl.createNewRule("testSnapshotRule", "",
+ "snapshotTesting", "testSnapshot", "drl");
+
+ impl.createPackageSnapshot("testSnapshot", "X", false, "ya");
+ SnapshotInfo[] snaps = impl.listSnapshots("testSnapshot");
+ assertEquals(1, snaps.length);
+ assertEquals("X", snaps[0].name);
+ assertEquals("ya", snaps[0].comment);
+ assertNotNull(snaps[0].uuid);
+ PackageConfigData confSnap = impl.loadPackageConfig(snaps[0].uuid);
+ assertEquals("testSnapshot", confSnap.name);
+
+ impl.createPackageSnapshot("testSnapshot", "Y", false, "we");
+ assertEquals(2, impl.listSnapshots("testSnapshot").length);
+ impl.createPackageSnapshot("testSnapshot", "X", true, "we");
+ assertEquals(2, impl.listSnapshots("testSnapshot").length);
+
+ impl.copyOrRemoveSnapshot("testSnapshot", "X", false, "Q");
+ assertEquals(3, impl.listSnapshots("testSnapshot").length);
+
+ try {
+ impl.copyOrRemoveSnapshot("testSnapshot", "X", false, "");
+ fail("should not be able to copy snapshot to empty detination");
+ } catch (SerializableException e) {
+ assertNotNull(e.getMessage());
+ }
+
+ impl.copyOrRemoveSnapshot("testSnapshot", "X", true, null);
+ assertEquals(2, impl.listSnapshots("testSnapshot").length);
+
+ }
+
+ public void testSnapshotRebuild() throws Exception {
+
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ // get rid of other snapshot crap
+ Iterator pkit = repo.listPackages();
+ while (pkit.hasNext()) {
+ PackageItem pkg = (PackageItem) pkit.next();
+ String[] snaps = repo.listPackageSnapshots(pkg.getName());
+ for (String snapName : snaps) {
+ repo.removePackageSnapshot(pkg.getName(), snapName);
+ }
+ }
+
+ PackageItem pkg = repo.createPackage("testSnapshotRebuild", "");
+ ServiceImplementation.updateDroolsHeader("import java.util.List", pkg);
+ repo.save();
+
+ AssetItem item = pkg.addAsset("anAsset", "");
+ item.updateFormat(AssetFormats.DRL);
+ item
+ .updateContent(" rule abc \n when \n then \n System.out.println(42); \n end");
+ item.checkin("");
+
+ BuilderResult[] res = impl.buildPackage(pkg.getUUID(), "", true);
+ assertNull(res);
+
+ impl.createPackageSnapshot("testSnapshotRebuild", "SNAP", false, "");
+
+ PackageItem snap = repo.loadPackageSnapshot("testSnapshotRebuild",
+ "SNAP");
+ long snapTime = snap.getLastModified().getTimeInMillis();
+
+ Thread.sleep(100);
+
+ impl.rebuildSnapshots();
+
+ PackageItem snap_ = repo.loadPackageSnapshot("testSnapshotRebuild",
+ "SNAP");
+ long newTime = snap_.getLastModified().getTimeInMillis();
+
+ assertTrue(newTime > snapTime);
+
+ item.updateContent("garbage");
+ item.checkin("");
+
+ impl.createPackageSnapshot("testSnapshotRebuild", "SNAP2", false, "");
+
+ try {
+ impl.rebuildSnapshots();
+ } catch (DetailedSerializableException e) {
+ assertNotNull(e.getMessage());
+ assertNotNull(e.getLongDescription());
+ }
+
+ }
+
+ public void testRemoveCategory() throws Exception {
+
+ RepositoryService impl = getService();
+ String[] children = impl.loadChildCategories("/");
+ impl.createCategory("/", "testRemoveCategory", "foo");
+
+
+ impl.removeCategory("testRemoveCategory");
+ String[] _children = impl.loadChildCategories("/");
+ assertEquals(children.length, _children.length);
+
+
+
+ }
+
+ public void testRemoveAsset() throws Exception {
+ RepositoryService impl = getService();
+ String cat = "testRemoveAsset";
+ impl.createCategory("/", cat, "ya");
+ String pkgUUID = impl.createPackage("testRemoveAsset", "");
+
+ String uuid = impl.createNewRule("testRemoveAsset", "x", cat,
+ "testRemoveAsset", "testRemoveAsset");
+
+ String uuid2 = impl.createNewRule("testRemoveAsset2", "x", cat,
+ "testRemoveAsset", "testRemoveAsset");
+
+ String uuid3 = impl.createNewRule("testRemoveAsset3", "x", cat,
+ "testRemoveAsset", "testRemoveAsset");
+ String uuid4 = impl.createNewRule("testRemoveAsset4", "x", cat,
+ "testRemoveAsset", "testRemoveAsset");
+
+ TableDataResult res = impl.listAssets(pkgUUID, arr("testRemoveAsset"),
+ 0, -1, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(4, res.data.length);
+
+ impl.removeAsset(uuid4);
+
+ res = impl.listAssets(pkgUUID, arr("testRemoveAsset"), 0, -1, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(3, res.data.length);
+ }
+
+ public void testRemovePackage() throws Exception {
+ ServiceImplementation impl = getService();
+ int n = impl.listPackages().length;
+ PackageItem p = impl.repository.createPackage("testRemovePackage", "");
+ assertNotNull(impl.loadPackageConfig(p.getUUID()));
+
+ impl.removePackage(p.getUUID());
+ assertEquals(n, impl.listPackages().length);
+ }
+
+
+ public void testArchiveAsset() throws Exception {
+ RepositoryService impl = getService();
+ String cat = "testArchiveAsset";
+ impl.createCategory("/", cat, "ya");
+ String pkgUUID = impl.createPackage("testArchiveAsset", "");
+
+ String uuid = impl.createNewRule("testArchiveAsset", "x", cat,
+ "testArchiveAsset", "testArchiveAsset");
+
+ String uuid2 = impl.createNewRule("testArchiveAsset2", "x", cat,
+ "testArchiveAsset", "testArchiveAsset");
+
+ String uuid3 = impl.createNewRule("testArchiveAsset3", "x", cat,
+ "testArchiveAsset", "testArchiveAsset");
+ String uuid4 = impl.createNewRule("testArchiveAsset4", "x", cat,
+ "testArchiveAsset", "testArchiveAsset");
+
+ TableDataResult res = impl.listAssets(pkgUUID, arr("testArchiveAsset"),
+ 0, -1, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(4, res.data.length);
+ assertEquals(4, res.total);
+ assertFalse(res.hasNext);
+
+ TableDataResult td = impl.loadArchivedAssets(0, 1000);
+
+ impl.archiveAsset(uuid4, true);
+
+ TableDataResult td2 = impl.loadArchivedAssets(0, 1000);
+ assertTrue(td2.data.length == td.data.length + 1);
+
+ res = impl.listAssets(pkgUUID, arr("testArchiveAsset"), 0, -1, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(3, res.data.length);
+
+ impl.archiveAsset(uuid4, false);
+
+ res = impl.listAssets(pkgUUID, arr("testArchiveAsset"), 0, -1, AssetItemGrid.RULE_LIST_TABLE_ID);
+ assertEquals(4, res.data.length);
+
+
+
+
+ }
+
+ public void testLoadSuggestionCompletionEngine() throws Exception {
+ RepositoryService impl = getService();
+ String uuid = impl.createPackage("testSuggestionComp", "x");
+ PackageConfigData conf = impl.loadPackageConfig(uuid);
+ conf.header = "import java.util.List";
+
+ SuggestionCompletionEngine eng = impl
+ .loadSuggestionCompletionEngine("testSuggestionComp");
+ assertNotNull(eng);
+
+ }
+
+ /**
+ * This will test creating a package, check it compiles, and can exectute
+ * rules, then take a snapshot, and check that it reports errors.
+ */
+ public void testBinaryPackageCompileAndExecute() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ // create our package
+ PackageItem pkg = repo.createPackage("testBinaryPackageCompile", "");
+ ServiceImplementation.updateDroolsHeader("import org.drools.Person", pkg);
+ AssetItem rule1 = pkg.addAsset("rule_1", "");
+ rule1.updateFormat(AssetFormats.DRL);
+ rule1
+ .updateContent("rule 'rule1' \n when \np : Person() \n then \np.setAge(42); \n end");
+ rule1.checkin("");
+ repo.save();
+
+ BuilderResult[] results = impl.buildPackage(pkg.getUUID(), null, true);
+ assertNull(results);
+
+ pkg = repo.loadPackage("testBinaryPackageCompile");
+ byte[] binPackage = pkg.getCompiledPackageBytes();
+
+ assertNotNull(binPackage);
+
+ Package binPkg = (Package) DroolsStreamUtils.streamIn(binPackage);
+
+ assertNotNull(binPkg);
+ assertTrue(binPkg.isValid());
+
+ Person p = new Person();
+
+ BinaryRuleBaseLoader loader = new BinaryRuleBaseLoader();
+ loader.addPackage(new ByteArrayInputStream(binPackage));
+ RuleBase rb = loader.getRuleBase();
+
+ StatelessSession sess = rb.newStatelessSession();
+ sess.execute(p);
+ assertEquals(42, p.getAge());
+
+ impl.createPackageSnapshot("testBinaryPackageCompile", "SNAP1", false,
+ "");
+
+ rule1
+ .updateContent("rule 'rule1' \n when p:PersonX() \n then System.err.println(42); \n end");
+ rule1.checkin("");
+
+ results = impl.buildPackage(pkg.getUUID(), null, true);
+ assertNotNull(results);
+ assertEquals(1, results.length);
+ assertEquals(rule1.getName(), results[0].assetName);
+ assertEquals(AssetFormats.DRL, results[0].assetFormat);
+ assertNotNull(results[0].message);
+ assertEquals(rule1.getUUID(), results[0].uuid);
+
+ pkg = repo.loadPackageSnapshot("testBinaryPackageCompile", "SNAP1");
+ results = impl.buildPackage(pkg.getUUID(), null, true);
+ assertNull(results);
+
+ }
+
+ /**
+ * This will test creating a package with a BRL rule, check it compiles, and
+ * can exectute rules, then take a snapshot, and check that it reports
+ * errors.
+ */
+ public void testBinaryPackageCompileAndExecuteWithBRXML() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ // create our package
+ PackageItem pkg = repo.createPackage("testBinaryPackageCompileBRL", "");
+ ServiceImplementation.updateDroolsHeader("import org.drools.Person", pkg);
+ AssetItem rule2 = pkg.addAsset("rule2", "");
+ rule2.updateFormat(AssetFormats.BUSINESS_RULE);
+
+ RuleModel model = new RuleModel();
+ model.name = "rule2";
+ FactPattern pattern = new FactPattern("Person");
+
+ SingleFieldConstraint con = new SingleFieldConstraint();
+ con.constraintValueType = ISingleFieldConstraint.TYPE_PREDICATE;
+ con.value = "name soundslike 'foobar'";
+ pattern.addConstraint(con);
+
+ pattern.boundName = "p";
+ ActionSetField action = new ActionSetField("p");
+ ActionFieldValue value = new ActionFieldValue("age", "42",
+ SuggestionCompletionEngine.TYPE_NUMERIC);
+ action.addFieldValue(value);
+
+ model.addLhsItem(pattern);
+ model.addRhsItem(action);
+
+ rule2.updateContent(BRXMLPersistence.getInstance().marshal(model));
+ rule2.checkin("");
+ repo.save();
+
+ BuilderResult[] results = impl.buildPackage(pkg.getUUID(), null, true);
+ if (results != null) {
+ for (int i = 0; i < results.length; i++) {
+ System.err.println(results[i].message);
+ }
+ }
+ assertNull(results);
+
+ pkg = repo.loadPackage("testBinaryPackageCompileBRL");
+ byte[] binPackage = pkg.getCompiledPackageBytes();
+
+ // Here is where we write it out if needed... UNCOMMENT if needed for
+ // the binary test
+ // FileOutputStream out = new
+ // FileOutputStream("/Users/michaelneale/RepoBinPackage.pkg");
+ // out.write( binPackage );
+ // out.flush();
+ // out.close();
+
+ assertNotNull(binPackage);
+
+ Package binPkg = (Package) DroolsStreamUtils.streamIn(binPackage);
+
+ assertNotNull(binPkg);
+ assertTrue(binPkg.isValid());
+
+ // and this shows off the "soundex" thing...
+ Person p = new Person("fubar");
+
+ BinaryRuleBaseLoader loader = new BinaryRuleBaseLoader();
+ loader.addPackage(new ByteArrayInputStream(binPackage));
+ RuleBase rb = loader.getRuleBase();
+
+ StatelessSession sess = rb.newStatelessSession();
+ sess.execute(p);
+ assertEquals(42, p.getAge());
+
+ impl.createPackageSnapshot("testBinaryPackageCompileBRL", "SNAP1",
+ false, "");
+
+ pattern.factType = "PersonX";
+ rule2.updateContent(BRXMLPersistence.getInstance().marshal(model));
+ rule2.checkin("");
+
+ results = impl.buildPackage(pkg.getUUID(), null, true);
+ assertNotNull(results);
+ assertTrue(results.length > 0);
+ // assertEquals(2, results.length);
+ assertEquals(rule2.getName(), results[0].assetName);
+ assertEquals(AssetFormats.BUSINESS_RULE, results[0].assetFormat);
+ assertNotNull(results[0].message);
+ assertEquals(rule2.getUUID(), results[0].uuid);
+
+ pkg = repo.loadPackageSnapshot("testBinaryPackageCompileBRL", "SNAP1");
+ results = impl.buildPackage(pkg.getUUID(), null, true);
+ assertNull(results);
+
+ // check that the rule name in the model is being set
+ AssetItem asset2 = pkg.addAsset("testSetRuleName", "");
+ asset2.updateFormat(AssetFormats.BUSINESS_RULE);
+ asset2.checkin("");
+
+ RuleModel model2 = new RuleModel();
+ assertNull(model2.name);
+ RuleAsset asset = impl.loadRuleAsset(asset2.getUUID());
+ asset.content = (IsSerializable) model2;
+
+ impl.checkinVersion(asset);
+
+ asset = impl.loadRuleAsset(asset2.getUUID());
+
+ model2 = (RuleModel) asset.content;
+ assertNotNull(model2);
+ assertNotNull(model2.name);
+ assertEquals(asset2.getName(), model2.name);
+
+ }
+
+ /**
+ * this loads up a precompile binary package. If this fails, then it means
+ * it needs to be updated. It gets the package form the BRL example above.
+ */
+ public void IGNORE_testLoadAndExecBinary() throws Exception {
+ Person p = new Person("fubar");
+ BinaryRuleBaseLoader loader = new BinaryRuleBaseLoader();
+ loader.addPackage(this.getClass().getResourceAsStream(
+ "/RepoBinPackage.pkg"));
+ RuleBase rb = loader.getRuleBase();
+ StatelessSession sess = rb.newStatelessSession();
+ sess.execute(p);
+ assertEquals(42, p.getAge());
+ }
+
+ public void testPackageSource() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ // create our package
+ PackageItem pkg = repo.createPackage("testPackageSource", "");
+ ServiceImplementation.updateDroolsHeader("import org.goo.Ber", pkg);
+ AssetItem rule1 = pkg.addAsset("rule_1", "");
+ rule1.updateFormat(AssetFormats.DRL);
+ rule1
+ .updateContent("rule 'rule1' \n when p:Person() \n then p.setAge(42); \n end");
+ rule1.checkin("");
+ repo.save();
+
+ AssetItem func = pkg.addAsset("funky", "");
+ func.updateFormat(AssetFormats.FUNCTION);
+ func.updateContent("this is a func");
+ func.checkin("");
+
+ String drl = impl.buildPackageSource(pkg.getUUID());
+ assertNotNull(drl);
+
+ assertTrue(drl.indexOf("import org.goo.Ber") > -1);
+ assertTrue(drl.indexOf("package testPackageSource") > -1);
+ assertTrue(drl.indexOf("rule 'rule1'") > -1);
+ assertTrue(drl.indexOf("this is a func") > -1);
+ assertTrue(drl.indexOf("this is a func") < drl.indexOf("rule 'rule1'"));
+ assertTrue(drl.indexOf("package testPackageSource") < drl
+ .indexOf("this is a func"));
+ assertTrue(drl.indexOf("package testPackageSource") < drl
+ .indexOf("import org.goo.Ber"));
+
+ AssetItem dsl = pkg.addAsset("MyDSL", "");
+ dsl.updateFormat(AssetFormats.DSL);
+ dsl
+ .updateContent("[when]This is foo=bar()\n[then]do something=yeahMan();");
+ dsl.checkin("");
+
+ AssetItem asset = pkg.addAsset("MyDSLRule", "");
+ asset.updateFormat(AssetFormats.DSL_TEMPLATE_RULE);
+ asset.updateContent("when \n This is foo \n then \n do something");
+ asset.checkin("");
+
+ drl = impl.buildPackageSource(pkg.getUUID());
+ assertNotNull(drl);
+
+ assertTrue(drl.indexOf("import org.goo.Ber") > -1);
+ assertTrue(drl.indexOf("This is foo") == -1);
+ assertTrue(drl.indexOf("do something") == -1);
+ assertTrue(drl.indexOf("bar()") > 0);
+ assertTrue(drl.indexOf("yeahMan();") > 0);
+
+ }
+
+ public void testAssetSource() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ // create our package
+ PackageItem pkg = repo.createPackage("testAssetSource", "");
+ AssetItem asset = pkg.addAsset("testRule", "");
+ asset.updateFormat(AssetFormats.DRL);
+ asset.updateContent("rule 'n' \n when Foo() then bar(); \n end");
+ asset.checkin("");
+ repo.save();
+
+ RuleAsset rule = impl.loadRuleAsset(asset.getUUID());
+ String drl = impl.buildAssetSource(rule);
+ assertEquals("rule 'n' \n when Foo() then bar(); \n end", drl);
+
+ asset = pkg.addAsset("DT", "");
+ asset.updateFormat(AssetFormats.DECISION_SPREADSHEET_XLS);
+ asset.updateBinaryContentAttachment(this.getClass()
+ .getResourceAsStream("/SampleDecisionTable.xls"));
+ asset.checkin("");
+
+ rule = impl.loadRuleAsset(asset.getUUID());
+ drl = impl.buildAssetSource(rule);
+ assertNotNull(drl);
+ assertTrue(drl.indexOf("rule") > -1);
+ assertTrue(drl.indexOf("policy: Policy") > -1);
+
+ AssetItem dsl = pkg.addAsset("MyDSL", "");
+ dsl.updateFormat(AssetFormats.DSL);
+ dsl
+ .updateContent("[when]This is foo=bar()\n[then]do something=yeahMan();");
+ dsl.checkin("");
+
+ asset = pkg.addAsset("MyDSLRule", "");
+ asset.updateFormat(AssetFormats.DSL_TEMPLATE_RULE);
+ asset.updateContent("when \n This is foo \n then \n do something");
+ asset.checkin("");
+
+ rule = impl.loadRuleAsset(asset.getUUID());
+ drl = impl.buildAssetSource(rule);
+ assertNotNull(drl);
+ assertTrue(drl.indexOf("This is foo") == -1);
+ assertTrue(drl.indexOf("do something") == -1);
+ assertTrue(drl.indexOf("bar()") > -1);
+ assertTrue(drl.indexOf("yeahMan();") > -1);
+
+ rule = impl.loadRuleAsset(repo.copyAsset(asset.getUUID(),
+ "testAssetSource", "newRuleName"));
+ // System.err.println(((RuleContentText)rule.content).content);
+ drl = impl.buildAssetSource(rule);
+ assertNotNull(drl);
+ assertTrue(drl.indexOf("newRuleName") > 0);
+
+ }
+
+ public void testBuildAsset() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ // create our package
+ PackageItem pkg = repo.createPackage("testBuildAsset", "");
+ AssetItem model = pkg.addAsset("MyModel", "");
+ model.updateFormat(AssetFormats.MODEL);
+ model.updateBinaryContentAttachment(this.getClass()
+ .getResourceAsStream("/billasurf.jar"));
+ model.checkin("");
+
+ ServiceImplementation.updateDroolsHeader("import com.billasurf.Person", pkg);
+
+ AssetItem asset = pkg.addAsset("testRule", "");
+ asset.updateFormat(AssetFormats.DRL);
+ asset
+ .updateContent("rule 'MyGoodRule' \n when Person() then System.err.println(42); \n end");
+ asset.checkin("");
+ repo.save();
+
+ RuleAsset rule = impl.loadRuleAsset(asset.getUUID());
+
+ // check its all OK
+ BuilderResult[] result = impl.buildAsset(rule);
+ assertNull(result);
+
+ // try it with a bad rule
+ RuleContentText text = new RuleContentText();
+ text.content = "rule 'MyBadRule' \n when Personx() then System.err.println(42); \n end";
+ rule.content = text;
+
+ result = impl.buildAsset(rule);
+ assertNotNull(result);
+ assertNotNull(result[0].message);
+ assertEquals(AssetFormats.DRL, result[0].assetFormat);
+
+ // now mix in a DSL
+ AssetItem dsl = pkg.addAsset("MyDSL", "");
+ dsl.updateFormat(AssetFormats.DSL);
+ dsl
+ .updateContent("[when]There is a person=Person()\n[then]print out 42=System.err.println(42);");
+ dsl.checkin("");
+
+ AssetItem dslRule = pkg.addAsset("dslRule", "");
+ dslRule.updateFormat(AssetFormats.DSL_TEMPLATE_RULE);
+ dslRule
+ .updateContent("when \n There is a person \n then \n print out 42");
+ dslRule.checkin("");
+
+ rule = impl.loadRuleAsset(dslRule.getUUID());
+
+ result = impl.buildAsset(rule);
+ assertNull(result);
+
+ asset = pkg.addAsset("someEnumThing", "");
+ asset.updateFormat(AssetFormats.ENUMERATION);
+ asset.updateContent("goober boy");
+ asset.checkin("");
+ result = impl.buildAsset(impl.loadRuleAsset(asset.getUUID()));
+ assertFalse(result.length == 0);
+
+ }
+
+ public void testBuildAssetBRXMLAndCopy() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ // create our package
+ PackageItem pkg = repo.createPackage("testBuildAssetBRL", "");
+ AssetItem model = pkg.addAsset("MyModel", "");
+ model.updateFormat(AssetFormats.MODEL);
+ model.updateBinaryContentAttachment(this.getClass()
+ .getResourceAsStream("/billasurf.jar"));
+ model.checkin("");
+
+ ServiceImplementation.updateDroolsHeader("import com.billasurf.Person", pkg);
+ impl.createCategory("/", "brl", "");
+
+ String uuid = impl.createNewRule("testBRL", "", "brl",
+ "testBuildAssetBRL", AssetFormats.BUSINESS_RULE);
+
+ RuleAsset rule = impl.loadRuleAsset(uuid);
+
+ RuleModel m = (RuleModel) rule.content;
+ assertNotNull(m);
+ m.name = "testBRL";
+
+ FactPattern p = new FactPattern("Person");
+ p.boundName = "p";
+ SingleFieldConstraint con = new SingleFieldConstraint();
+ con.fieldName = "name";
+ con.value = "mark";
+ con.operator = "==";
+ con.constraintValueType = SingleFieldConstraint.TYPE_LITERAL;
+
+ p.addConstraint(con);
+
+ m.addLhsItem(p);
+
+ ActionSetField set = new ActionSetField("p");
+ ActionFieldValue f = new ActionFieldValue("name", "42-ngoo",
+ SuggestionCompletionEngine.TYPE_STRING);
+ set.addFieldValue(f);
+
+ m.addRhsItem(set);
+
+ impl.checkinVersion(rule);
+
+ // check its all OK
+ BuilderResult[] result = impl.buildAsset(rule);
+ if (result != null) {
+ for (int i = 0; i < result.length; i++) {
+ System.err.println(result[i].message);
+ }
+ }
+ assertNull(result);
+
+ List assets = iteratorToList(pkg.getAssets());
+ assertEquals(3, assets.size());
+ // now lets copy...
+ String newUUID = impl.copyAsset(rule.uuid, rule.metaData.packageName,
+ "ruleName2");
+
+ assets = iteratorToList(pkg.getAssets());
+ assertEquals(4, assets.size()); //we have 4 due to the drools.package file.
+ RuleAsset asset = impl.loadRuleAsset(newUUID);
+
+ String pkgSource = impl.buildPackageSource(pkg.getUUID());
+
+ assertTrue(pkgSource.indexOf("ruleName2") > 0);
+ assertTrue(impl.buildAssetSource(asset).indexOf("ruleName2") > 0);
+ assertTrue(impl.buildAssetSource(asset).indexOf("testBRL") == -1);
+
+ // RuleModel model2 = (RuleModel) asset.content;
+ // assertEquals("ruleName2", model2.name);
+
+ }
+
+ private List iteratorToList(Iterator assets) {
+ List result = new ArrayList();
+ while (assets.hasNext()) {
+ result.add(assets.next());
+
+ }
+ return result;
+ }
+
+ public void testBuildAssetWithPackageConfigError() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ PackageItem pkg = repo.createPackage(
+ "testBuildAssetWithPackageConfigError", "");
+ // AssetItem model = pkg.addAsset( "MyModel", "" );
+ // model.updateFormat( AssetFormats.MODEL );
+ // model.updateBinaryContentAttachment(
+ // this.getClass().getResourceAsStream( "/billasurf.jar" ) );
+ // model.checkin( "" );
+
+ // pkg.updateHeader( "import com.billasurf.Person" );
+
+ AssetItem asset = pkg.addAsset("testRule", "");
+ asset.updateFormat(AssetFormats.DRL);
+ asset.updateContent("rule 'MyGoodRule' \n when \n then \n end");
+ asset.checkin("");
+ repo.save();
+
+ RuleAsset rule = impl.loadRuleAsset(asset.getUUID());
+
+ // check its all OK
+ BuilderResult[] result = impl.buildAsset(rule);
+ if (!(result == null)) {
+ System.err.println(result[0].assetName + " " + result[0].message);
+ }
+ assertNull(result);
+
+ ServiceImplementation.updateDroolsHeader("importxxxx", pkg);
+ repo.save();
+ result = impl.buildAsset(rule);
+ assertNotNull(result);
+
+ assertEquals(1, result.length);
+ assertEquals("package", result[0].assetFormat);
+ assertNotNull(result[0].message);
+
+ }
+
+ public void testRuleNameList() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ // create our package
+ PackageItem pkg = repo.createPackage("testRuleNameList", "");
+ ServiceImplementation.updateDroolsHeader("import org.goo.Ber", pkg);
+ AssetItem rule1 = pkg.addAsset("rule_1", "");
+ rule1.updateFormat(AssetFormats.DRL);
+ rule1
+ .updateContent("rule 'rule1' \n when p:Person() \n then p.setAge(42); \n end");
+ rule1.checkin("");
+ repo.save();
+
+ AssetItem rule2 = pkg.addAsset("rule_2", "");
+ rule2.updateFormat(AssetFormats.DRL);
+ rule2
+ .updateContent("rule 'rule2' \n when p:Person() \n then p.setAge(42); \n end");
+ rule2.checkin("");
+ repo.save();
+
+ String[] list = impl.listRulesInPackage(pkg.getName());
+ assertEquals(2, list.length);
+ assertEquals("rule1", list[0]);
+ assertEquals("rule2", list[1]);
+
+ }
+
+ /**
+ * This idea of this is to not compile packages more then we have to.
+ */
+ public void testBinaryUpToDate() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ // create our package
+ PackageItem pkg = repo.createPackage("testBinaryPackageUpToDate", "");
+ assertFalse(pkg.isBinaryUpToDate());
+ ServiceImplementation.updateDroolsHeader("import org.drools.Person", pkg);
+ AssetItem rule1 = pkg.addAsset("rule_1", "");
+ rule1.updateFormat(AssetFormats.DRL);
+ rule1
+ .updateContent("rule 'rule1' \n when \np : Person() \n then \np.setAge(42); \n end");
+ rule1.checkin("");
+ repo.save();
+
+ assertFalse(pkg.isBinaryUpToDate());
+ assertFalse(impl.ruleBaseCache.containsKey(pkg.getUUID()));
+ impl.ruleBaseCache.remove("XXX");
+
+ BuilderResult[] results = impl.buildPackage(pkg.getUUID(), null, true);
+ assertNull(results);
+
+ pkg = repo.loadPackage("testBinaryPackageUpToDate");
+ byte[] binPackage = pkg.getCompiledPackageBytes();
+
+ assertNotNull(binPackage);
+
+ assertTrue(pkg.getNode().getProperty("drools:binaryUpToDate")
+ .getBoolean());
+ assertTrue(pkg.isBinaryUpToDate());
+ assertFalse(impl.ruleBaseCache.containsKey(pkg.getUUID()));
+
+ RuleAsset asset = impl.loadRuleAsset(rule1.getUUID());
+ impl.checkinVersion(asset);
+
+ assertFalse(pkg.getNode().getProperty("drools:binaryUpToDate")
+ .getBoolean());
+ assertFalse(impl.ruleBaseCache.containsKey(pkg.getUUID()));
+
+ impl.buildPackage(pkg.getUUID(), null, false);
+
+ assertTrue(pkg.getNode().getProperty("drools:binaryUpToDate")
+ .getBoolean());
+ assertFalse(impl.ruleBaseCache.containsKey(pkg.getUUID()));
+
+ PackageConfigData config = impl.loadPackageConfig(pkg.getUUID());
+ impl.savePackage(config);
+
+ assertFalse(pkg.getNode().getProperty("drools:binaryUpToDate")
+ .getBoolean());
+ assertFalse(pkg.isBinaryUpToDate());
+ impl.buildPackage(pkg.getUUID(), null, false);
+ assertTrue(pkg.getNode().getProperty("drools:binaryUpToDate")
+ .getBoolean());
+ assertTrue(pkg.isBinaryUpToDate());
+
+ }
+
+ public void testRunScenario() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ PackageItem pkg = repo.createPackage("testScenarioRun", "");
+ ServiceImplementation.updateDroolsHeader("import org.drools.Person\n global org.drools.Cheese cheese\n", pkg);
+ AssetItem rule1 = pkg.addAsset("rule_1", "");
+ rule1.updateFormat(AssetFormats.DRL);
+ rule1
+ .updateContent("rule 'rule1' \n when \np : Person() \n then \np.setAge(42); \n end");
+ rule1.checkin("");
+ repo.save();
+
+ Scenario sc = new Scenario();
+ FactData person = new FactData();
+ person.name = "p";
+ person.type = "Person";
+ person.fieldData.add(new FieldData("age", "40"));
+ person.fieldData.add(new FieldData("name", "michael"));
+
+ sc.fixtures.add(person);
+ sc.fixtures.add(new ExecutionTrace());
+ VerifyRuleFired vr = new VerifyRuleFired("rule1", 1, null);
+ sc.fixtures.add(vr);
+
+ VerifyFact vf = new VerifyFact();
+ vf.name = "p";
+ vf.fieldValues.add(new VerifyField("name", "michael", "=="));
+ vf.fieldValues.add(new VerifyField("age", "42", "=="));
+ sc.fixtures.add(vf);
+
+ FactData cheese = new FactData();
+ cheese.name = "cheese";
+ cheese.type = "Cheese";
+ cheese.fieldData.add(new FieldData("price", "42"));
+ sc.globals.add(cheese);
+
+ ScenarioRunResult res = impl.runScenario(pkg.getName(), sc);
+ assertEquals(null, res.errors);
+ assertNotNull(res.scenario);
+ assertTrue(vf.wasSuccessful());
+ assertTrue(vr.wasSuccessful());
+
+
+
+ res = impl.runScenario(pkg.getName(), sc);
+ assertEquals(null, res.errors);
+ assertNotNull(res.scenario);
+ assertTrue(vf.wasSuccessful());
+ assertTrue(vr.wasSuccessful());
+
+
+ impl.ruleBaseCache.clear();
+ res = impl.runScenario(pkg.getName(), sc);
+ assertEquals(null, res.errors);
+ assertNotNull(res.scenario);
+ assertTrue(vf.wasSuccessful());
+ assertTrue(vr.wasSuccessful());
+
+ //BuilderResult[] results = impl.buildPackage(pkg.getUUID(), null, true);
+ //assertNull(results);
+
+ rule1.updateContent("Junk");
+ rule1.checkin("");
+
+
+
+ impl.ruleBaseCache.clear();
+ pkg.updateBinaryUpToDate(false);
+ repo.save();
+ res = impl.runScenario(pkg.getName(), sc);
+ assertNotNull(res.errors);
+ assertNull(res.scenario);
+
+ assertTrue(res.errors.length > 0);
+
+
+ impl.createCategory("/", "sc", "");
+
+ String scenarioId = impl.createNewRule("sc1", "s", "sc", pkg.getName(), AssetFormats.TEST_SCENARIO);
+
+ RuleAsset asset = impl.loadRuleAsset(scenarioId);
+ assertNotNull(asset.content);
+ assertTrue(asset.content instanceof Scenario);
+
+ Scenario sc_ = (Scenario) asset.content;
+ sc_.fixtures.add(new ExecutionTrace());
+ impl.checkinVersion(asset);
+ asset = impl.loadRuleAsset(scenarioId);
+ assertNotNull(asset.content);
+ assertTrue(asset.content instanceof Scenario);
+ sc_ = (Scenario) asset.content;
+ assertEquals(1, sc_.fixtures.size());
+
+ }
+
+ public void testRunScenarioWithGeneratedBeans() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ PackageItem pkg = repo.createPackage("testScenarioRunWithGeneratedBeans", "");
+ ServiceImplementation.updateDroolsHeader("declare GenBean\n name: String \n age: int \nend\n", pkg);
+ AssetItem rule1 = pkg.addAsset("rule_1", "");
+ rule1.updateFormat(AssetFormats.DRL);
+ rule1
+ .updateContent("rule 'rule1' \n when \n p : GenBean(name=='mic') \n then \n p.setAge(42); \n end");
+ rule1.checkin("");
+ repo.save();
+
+ Scenario sc = new Scenario();
+ FactData person = new FactData();
+ person.name = "c";
+ person.type = "GenBean";
+ person.fieldData.add(new FieldData("age", "40"));
+ person.fieldData.add(new FieldData("name", "mic"));
+
+ sc.fixtures.add(person);
+ sc.fixtures.add(new ExecutionTrace());
+ VerifyRuleFired vr = new VerifyRuleFired("rule1", 1, null);
+ sc.fixtures.add(vr);
+
+ VerifyFact vf = new VerifyFact();
+ vf.name = "c";
+ vf.fieldValues.add(new VerifyField("name", "mic", "=="));
+ vf.fieldValues.add(new VerifyField("age", "42", "=="));
+ sc.fixtures.add(vf);
+
+
+ ScenarioRunResult res = impl.runScenario(pkg.getName(), sc);
+ assertEquals(null, res.errors);
+ assertNotNull(res.scenario);
+ assertTrue(vf.wasSuccessful());
+ assertTrue(vr.wasSuccessful());
+
+
+
+ }
+
+ public void testRunScenarioWithJar() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ // create our package
+ PackageItem pkg = repo.createPackage("testRunScenarioWithJar", "");
+ AssetItem model = pkg.addAsset("MyModel", "");
+ model.updateFormat(AssetFormats.MODEL);
+ model.updateBinaryContentAttachment(this.getClass()
+ .getResourceAsStream("/billasurf.jar"));
+ model.checkin("");
+
+ ServiceImplementation.updateDroolsHeader("import com.billasurf.Board", pkg);
+
+ AssetItem asset = pkg.addAsset("testRule", "");
+ asset.updateFormat(AssetFormats.DRL);
+ asset.updateContent("rule 'MyGoodRule' \n dialect 'mvel' \n when Board() then System.err.println(42); \n end");
+ asset.checkin("");
+ repo.save();
+
+ Scenario sc = new Scenario();
+ FactData person = new FactData();
+ person.name = "p";
+ person.type = "Board";
+ person.fieldData.add(new FieldData("cost", "42"));
+
+
+ sc.fixtures.add(person);
+ sc.fixtures.add(new ExecutionTrace());
+ VerifyRuleFired vr = new VerifyRuleFired("MyGoodRule", 1, null);
+ sc.fixtures.add(vr);
+
+ VerifyFact vf = new VerifyFact();
+ vf.name = "p";
+
+ vf.fieldValues.add(new VerifyField("cost", "42", "=="));
+ sc.fixtures.add(vf);
+
+ ScenarioRunResult res = impl.runScenario(pkg.getName(), sc);
+ assertEquals(null, res.errors);
+ assertNotNull(res.scenario);
+ assertTrue(vf.wasSuccessful());
+ assertTrue(vr.wasSuccessful());
+
+
+ res = impl.runScenario(pkg.getName(), sc);
+ assertEquals(null, res.errors);
+ assertNotNull(res.scenario);
+ assertTrue(vf.wasSuccessful());
+ assertTrue(vr.wasSuccessful());
+
+ impl.ruleBaseCache.clear();
+
+ res = impl.runScenario(pkg.getName(), sc);
+ assertEquals(null, res.errors);
+ assertNotNull(res.scenario);
+ assertTrue(vf.wasSuccessful());
+ assertTrue(vr.wasSuccessful());
+
+
+
+
+ }
+
+ public void testRunPackageScenarios() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ PackageItem pkg = repo.createPackage("testScenarioRunBulk", "");
+ ServiceImplementation.updateDroolsHeader("import org.drools.Person", pkg);
+ AssetItem rule1 = pkg.addAsset("rule_1", "");
+ rule1.updateFormat(AssetFormats.DRL);
+ rule1
+ .updateContent("rule 'rule1' \n when \np : Person() \n then \np.setAge(42); \n end");
+ rule1.checkin("");
+
+ //this rule will never fire
+ AssetItem rule2 = pkg.addAsset("rule_2", "");
+ rule2.updateFormat(AssetFormats.DRL);
+ rule2.updateContent("rule 'rule2' \n when \np : Person(age == 1000) \n then \np.setAge(46); \n end");
+ rule2.checkin("");
+ repo.save();
+
+
+
+ //first, the green scenario
+ Scenario sc = new Scenario();
+ FactData person = new FactData();
+ person.name = "p";
+ person.type = "Person";
+ person.fieldData.add(new FieldData("age", "40"));
+ person.fieldData.add(new FieldData("name", "michael"));
+
+ sc.fixtures.add(person);
+ sc.fixtures.add(new ExecutionTrace());
+ VerifyRuleFired vr = new VerifyRuleFired("rule1", 1, null);
+ sc.fixtures.add(vr);
+
+ VerifyFact vf = new VerifyFact();
+ vf.name = "p";
+ vf.fieldValues.add(new VerifyField("name", "michael", "=="));
+ vf.fieldValues.add(new VerifyField("age", "42", "=="));
+ sc.fixtures.add(vf);
+
+ AssetItem scenario1 = pkg.addAsset("scen1", "");
+ scenario1.updateFormat(AssetFormats.TEST_SCENARIO);
+ scenario1.updateContent(ScenarioXMLPersistence.getInstance().marshal(sc));
+ scenario1.checkin("");
+
+ //now the bad scenario
+ sc = new Scenario();
+ person = new FactData();
+ person.name = "p";
+ person.type = "Person";
+ person.fieldData.add(new FieldData("age", "40"));
+ person.fieldData.add(new FieldData("name", "michael"));
+
+ sc.fixtures.add(person);
+ sc.fixtures.add(new ExecutionTrace());
+ vr = new VerifyRuleFired("rule2", 1, null);
+ sc.fixtures.add(vr);
+
+
+ AssetItem scenario2 = pkg.addAsset("scen2", "");
+ scenario2.updateFormat(AssetFormats.TEST_SCENARIO);
+ scenario2.updateContent(ScenarioXMLPersistence.getInstance().marshal(sc));
+ scenario2.checkin("");
+
+ BulkTestRunResult result = impl.runScenariosInPackage(pkg.getUUID());
+ assertNull(result.errors);
+
+ assertEquals(50, result.percentCovered);
+ assertEquals(1, result.rulesNotCovered.length);
+ assertEquals("rule2", result.rulesNotCovered[0]);
+
+ assertEquals(2, result.results.length);
+
+ ScenarioResultSummary s1 = result.results[0];
+ assertEquals(0, s1.failures);
+ assertEquals(3, s1.total);
+ assertEquals(scenario1.getUUID(), s1.uuid);
+ assertEquals(scenario1.getName(), s1.scenarioName);
+
+ ScenarioResultSummary s2 = result.results[1];
+ assertEquals(1, s2.failures);
+ assertEquals(1, s2.total);
+ assertEquals(scenario2.getUUID(), s2.uuid);
+ assertEquals(scenario2.getName(), s2.scenarioName);
+ }
+
+ public void testAnalysis() throws Exception {
+ ServiceImplementation impl = getService();
+ PackageItem pkg = impl.repository.createPackage("testAnalysis", "");
+ AssetItem asset = pkg.addAsset("SomeDRL", "");
+ asset.updateFormat(AssetFormats.DRL);
+
+ asset.updateContent(IO.read(this.getClass().getResourceAsStream("/AnalysisSample.drl")));
+ asset.checkin("");
+
+ AnalysisReport report = impl.analysePackage(pkg.getUUID());
+ assertNotNull(report);
+ assertEquals(0, report.errors.length);
+ assertEquals(11, report.warnings.length);
+ assertEquals(1, report.notes.length);
+ assertEquals(2, report.factUsages.length);
+
+ assertNotNull(report.notes[0].description);
+ assertNotNull(report.notes[0].reason);
+ assertEquals(2, report.notes[0].cause.length);
+ assertNotNull(report.notes[0].cause[0]);
+ assertNotNull(report.notes[0].cause[1]);
+
+ assertEquals("RedundancyPattern", report.factUsages[0].name);
+ assertEquals("RedundancyPattern2", report.factUsages[1].name);
+
+ assertEquals(1, report.factUsages[0].fields.length);
+ assertEquals(1, report.factUsages[1].fields.length);
+
+ assertEquals("a", report.factUsages[0].fields[0].name);
+ assertEquals("a", report.factUsages[1].fields[0].name);
+
+
+ assertEquals(3, report.factUsages[0].fields[0].rules.length);
+ assertEquals(2, report.factUsages[1].fields[0].rules.length);
+
+ assertNotNull(report.factUsages[0].fields[0].rules[0]);
+
+ }
+
+ public void testListFactTypesAvailableInPackage() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+
+ PackageItem pkg = repo.createPackage("testAvailableTypes", "");
+ AssetItem model = pkg.addAsset("MyModel", "");
+ model.updateFormat(AssetFormats.MODEL);
+ model.updateBinaryContentAttachment(this.getClass()
+ .getResourceAsStream("/billasurf.jar"));
+ model.checkin("");
+ repo.save();
+
+ String[] s = impl.listTypesInPackage(pkg.getUUID());
+ assertNotNull(s);
+ assertEquals(2, s.length);
+ assertEquals("com.billasurf.Person", s[0]);
+ assertEquals("com.billasurf.Board", s[1]);
+ }
+
+
+ public void testGuidedDTExecute() throws Exception {
+ ServiceImplementation impl = getService();
+ RulesRepository repo = impl.repository;
+ impl.createCategory("/", "decisiontables", "");
+
+ PackageItem pkg = repo.createPackage("testGuidedDTCompile", "");
+ ServiceImplementation.updateDroolsHeader("import org.drools.Person", pkg);
+ AssetItem rule1 = pkg.addAsset("rule_1", "");
+ rule1.updateFormat(AssetFormats.DRL);
+ rule1.updateContent("rule 'rule1' \n when \np : Person() \n then \np.setAge(42); \n end");
+ rule1.checkin("");
+ repo.save();
+
+
+ GuidedDecisionTable dt = new GuidedDecisionTable();
+ ConditionCol col = new ConditionCol();
+ col.boundName = "p";
+ col.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
+ col.factField = "hair";
+ col.factType = "Person";
+ col.operator = "==";
+ dt.conditionCols.add(col);
+
+ ActionSetFieldCol ac = new ActionSetFieldCol();
+ ac.boundName = "p";
+ ac.factField = "likes";
+ ac.type = SuggestionCompletionEngine.TYPE_STRING;
+ dt.actionCols.add(ac);
+
+ dt.data = new String[][] {
+ new String[] {"1", "descrip", "pink", "cheese"}
+ };
+
+ String uid = impl.createNewRule("decTable", "", "decisiontables", pkg.getName(), AssetFormats.DECISION_TABLE_GUIDED);
+ RuleAsset ass = impl.loadRuleAsset(uid);
+ ass.content = dt;
+ impl.checkinVersion(ass);
+
+ BuilderResult[] results = impl.buildPackage(pkg.getUUID(), null, true);
+ assertNull(results);
+
+ pkg = repo.loadPackage("testGuidedDTCompile");
+ byte[] binPackage = pkg.getCompiledPackageBytes();
+
+ assertNotNull(binPackage);
+
+ Package binPkg = (Package) DroolsStreamUtils.streamIn(binPackage);
+
+
+ assertEquals(2, binPkg.getRules().length);
+
+ assertNotNull(binPkg);
+ assertTrue(binPkg.isValid());
+
+ Person p = new Person();
+
+
+ p.setHair("pink");
+
+ BinaryRuleBaseLoader loader = new BinaryRuleBaseLoader();
+ loader.addPackage(new ByteArrayInputStream(binPackage));
+ RuleBase rb = loader.getRuleBase();
+
+ StatelessSession sess = rb.newStatelessSession();
+ sess.execute(p);
+ assertEquals(42, p.getAge());
+ assertEquals("cheese", p.getLikes());
+ }
+
+ public void testPackageNameSorting() {
+ PackageConfigData c1 = new PackageConfigData("org.foo");
+ PackageConfigData c2 = new PackageConfigData("org.foo.bar");
+
+ List<PackageConfigData> ls = new ArrayList<PackageConfigData>();
+ ls.add(c2);
+ ls.add(c1);
+ ServiceImplementation serv = new ServiceImplementation();
+ serv.sortPackages(ls);
+ assertEquals(c1, ls.get(0));
+ assertEquals(c2, ls.get(1));
+ }
+
+ public void testLoadDropDown() throws Exception {
+ ServiceImplementation serv = new ServiceImplementation();
+ String[] pairs = new String[]{"f1=x", "f2=2"};
+ String expression = "['@{f1}', '@{f2}']";
+ String[] r = serv.loadDropDownExpression(pairs, expression);
+ assertEquals(2, r.length);
+
+ assertEquals("x", r[0]);
+ assertEquals("2", r[1]);
+
+ }
+
+
+ private ServiceImplementation getService() throws Exception {
+ ServiceImplementation impl = new ServiceImplementation();
+
+ impl.repository = new RulesRepository(TestEnvironmentSessionHelper
+ .getSession());
+ return impl;
+ }
+
+}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/builder)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/builder/BRMSPackageBuilderTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.builder;
+package org.drools.guvnor.server.builder;
/*
* Copyright 2005 JBoss Inc
*
@@ -25,6 +25,7 @@
import junit.framework.TestCase;
import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.dsl.DSLMappingFile;
import org.drools.rule.Package;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/builder/ContentPackageAssemblerTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.builder;
+package org.drools.guvnor.server.builder;
/*
* Copyright 2005 JBoss Inc
*
@@ -30,19 +30,22 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.WorkingMemory;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brl.ActionSetField;
-import org.drools.brms.client.modeldriven.brl.DSLSentence;
-import org.drools.brms.client.modeldriven.brl.FactPattern;
-import org.drools.brms.client.modeldriven.brl.RuleModel;
-import org.drools.brms.server.ServiceImplementation;
-import org.drools.brms.server.selector.AssetSelector;
-import org.drools.brms.server.selector.SelectorManager;
-import org.drools.brms.server.util.BRXMLPersistence;
-import org.drools.brms.server.util.TestEnvironmentSessionHelper;
import org.drools.compiler.PackageBuilder;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
+import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
+import org.drools.guvnor.client.modeldriven.brl.DSLSentence;
+import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.RuleModel;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.builder.BRMSPackageBuilder;
+import org.drools.guvnor.server.builder.ContentAssemblyError;
+import org.drools.guvnor.server.builder.ContentPackageAssembler;
+import org.drools.guvnor.server.selector.AssetSelector;
+import org.drools.guvnor.server.selector.SelectorManager;
+import org.drools.guvnor.server.util.BRXMLPersistence;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/contenthandler)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/contenthandler/ContentHandlerTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,9 +19,19 @@
import junit.framework.TestCase;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.rpc.BuilderResult;
-import org.drools.brms.server.util.TestEnvironmentSessionHelper;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.rpc.BuilderResult;
+import org.drools.guvnor.server.contenthandler.BRLContentHandler;
+import org.drools.guvnor.server.contenthandler.ContentManager;
+import org.drools.guvnor.server.contenthandler.DRLFileContentHandler;
+import org.drools.guvnor.server.contenthandler.DSLDefinitionContentHandler;
+import org.drools.guvnor.server.contenthandler.DSLRuleContentHandler;
+import org.drools.guvnor.server.contenthandler.DecisionTableXLSHandler;
+import org.drools.guvnor.server.contenthandler.DefaultContentHandler;
+import org.drools.guvnor.server.contenthandler.EnumerationContentHandler;
+import org.drools.guvnor.server.contenthandler.GuidedDTContentHandler;
+import org.drools.guvnor.server.contenthandler.ModelContentHandler;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/contenthandler/ContentManagerTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,6 +1,9 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
-import org.drools.brms.client.common.AssetFormats;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.server.contenthandler.ContentManager;
+import org.drools.guvnor.server.contenthandler.DRLFileContentHandler;
+import org.drools.guvnor.server.contenthandler.ScenarioContentHandler;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.contenthandler;
+package org.drools.guvnor.server.contenthandler;
/*
* Copyright 2005 JBoss Inc
@@ -17,8 +17,9 @@
*/
import junit.framework.TestCase;
-import org.drools.brms.server.contenthandler.DRLFileContentHandler;
+import org.drools.guvnor.server.contenthandler.DRLFileContentHandler;
+
public class DRLFileContentHandlerTest extends TestCase {
public void testSniffDRLType() throws Exception {
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/files)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/DeploymentURIHelperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/files/DeploymentURIHelperTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/DeploymentURIHelperTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,6 +17,8 @@
+import org.drools.guvnor.server.files.PackageDeploymentURIHelper;
+
import junit.framework.TestCase;
public class DeploymentURIHelperTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/files/MockHTTPRequest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
import java.io.BufferedReader;
import java.io.IOException;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPResponse.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/files/MockHTTPResponse.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPResponse.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
import java.io.IOException;
import java.io.OutputStream;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/files/PackageDeploymentServletTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,10 +1,11 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
import java.io.ByteArrayOutputStream;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.server.ServiceImplementation;
-import org.drools.brms.server.util.TestEnvironmentSessionHelper;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.files.PackageDeploymentServlet;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/files/RestAPIServletTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -8,7 +8,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.util.Base64;
-import org.drools.brms.server.util.TestEnvironmentSessionHelper;
+import org.drools.guvnor.server.files.RestAPIServlet;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.AssetItemIterator;
import org.drools.repository.PackageItem;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/WebDAVImplTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/files/WebDAVImplTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/WebDAVImplTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.files;
+package org.drools.guvnor.server.files;
import java.io.File;
import java.io.InputStream;
@@ -10,7 +10,8 @@
import junit.framework.TestCase;
import org.apache.commons.io.IOUtils;
-import org.drools.brms.server.util.TestEnvironmentSessionHelper;
+import org.drools.guvnor.server.files.WebDAVImpl;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/repository)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/BRMSRepositoryConfigurationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/repository/BRMSRepositoryConfigurationTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/BRMSRepositoryConfigurationTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.repository;
+package org.drools.guvnor.server.repository;
/*
* Copyright 2005 JBoss Inc
*
@@ -20,6 +20,8 @@
+import org.drools.guvnor.server.repository.BRMSRepositoryConfiguration;
+
import junit.framework.TestCase;
public class BRMSRepositoryConfigurationTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepo.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/repository/MockRepo.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepo.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.drools.brms.server.repository;
+package org.drools.guvnor.server.repository;
import javax.jcr.Credentials;
import javax.jcr.LoginException;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepositoryConfigurator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/repository/MockRepositoryConfigurator.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepositoryConfigurator.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.drools.brms.server.repository;
+package org.drools.guvnor.server.repository;
import javax.jcr.Repository;
import javax.jcr.Session;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/repository/MockSession.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.drools.brms.server.repository;
+package org.drools.guvnor.server.repository;
import java.io.IOException;
import java.io.InputStream;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/repository/RulesRepositoryManagerTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.repository;
+package org.drools.guvnor.server.repository;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,6 +17,9 @@
+import org.drools.guvnor.server.repository.BRMSRepositoryConfiguration;
+import org.drools.guvnor.server.repository.RulesRepositoryManager;
+
import junit.framework.TestCase;
public class RulesRepositoryManagerTest extends TestCase {
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/rules (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/rules)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/rules/BRMSSuggestionCompletionLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/rules/BRMSSuggestionCompletionLoaderTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/rules/BRMSSuggestionCompletionLoaderTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.rules;
+package org.drools.guvnor.server.rules;
/*
* Copyright 2005 JBoss Inc
*
@@ -21,11 +21,12 @@
import junit.framework.TestCase;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.server.ServiceImplementation;
-import org.drools.brms.server.util.BRMSSuggestionCompletionLoader;
-import org.drools.brms.server.util.TestEnvironmentSessionHelper;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.rules.SuggestionCompletionLoader;
+import org.drools.guvnor.server.util.BRMSSuggestionCompletionLoader;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/security)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/security/SecurityServiceImplTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.security;
+package org.drools.guvnor.server.security;
/*
* Copyright 2005 JBoss Inc
*
@@ -17,6 +17,8 @@
+import org.drools.guvnor.server.security.SecurityServiceImpl;
+
import junit.framework.TestCase;
public class SecurityServiceImplTest extends TestCase {
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/selector)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/DummyClass.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/selector/DummyClass.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/DummyClass.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.selector;
+package org.drools.guvnor.server.selector;
public class DummyClass {
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/selector/SelectorManagerTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,5 +1,10 @@
-package org.drools.brms.server.selector;
+package org.drools.guvnor.server.selector;
+import org.drools.guvnor.server.selector.Allow;
+import org.drools.guvnor.server.selector.AssetSelector;
+import org.drools.guvnor.server.selector.RuleBasedSelector;
+import org.drools.guvnor.server.selector.SelectorManager;
+
import junit.framework.TestCase;
public class SelectorManagerTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/selector/TestSelector.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,5 +1,6 @@
-package org.drools.brms.server.selector;
+package org.drools.guvnor.server.selector;
+import org.drools.guvnor.server.selector.AssetSelector;
import org.drools.repository.AssetItem;
public class TestSelector
Copied: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util (from rev 20603, labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/util)
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/util/ClassicDRLImporterTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
*
@@ -22,9 +22,10 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.server.contenthandler.DRLFileContentHandler;
-import org.drools.brms.server.util.ClassicDRLImporter.Asset;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.server.contenthandler.DRLFileContentHandler;
+import org.drools.guvnor.server.util.ClassicDRLImporter;
+import org.drools.guvnor.server.util.ClassicDRLImporter.Asset;
import org.drools.lang.DRLParser;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/util/FileManagerUtilsTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
@@ -30,10 +30,12 @@
import junit.framework.TestCase;
import org.apache.commons.fileupload.FileItem;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.common.Snapshot;
-import org.drools.brms.server.ServiceImplementation;
-import org.drools.brms.server.files.FileManagerUtils;
+import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.guvnor.client.common.Snapshot;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.files.FileManagerUtils;
+import org.drools.guvnor.server.util.FormData;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/GWTNoSeamTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/util/GWTNoSeamTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/GWTNoSeamTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,7 +19,7 @@
import junit.framework.TestCase;
-import org.drools.brms.server.ServiceImplementation;
+import org.drools.guvnor.server.ServiceImplementation;
import org.jboss.seam.remoting.gwt.GWTToSeamAdapter;
public class GWTNoSeamTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/IO.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/util/IO.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/IO.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import java.io.BufferedReader;
import java.io.IOException;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/util/LoggingHelperTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,7 +1,9 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
import org.apache.log4j.Logger;
-import org.drools.brms.client.rpc.LogEntry;
+import org.drools.guvnor.client.rpc.LogEntry;
+import org.drools.guvnor.server.util.LoggingHelper;
+import org.drools.guvnor.server.util.MessageList;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/util/MetaDataMapperTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,7 +19,8 @@
import junit.framework.TestCase;
-import org.drools.brms.client.rpc.MetaData;
+import org.drools.guvnor.client.rpc.MetaData;
+import org.drools.guvnor.server.util.MetaDataMapper;
public class MetaDataMapperTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/util/TableDisplayHandlerTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
*
@@ -19,6 +19,8 @@
import java.lang.reflect.Method;
+import org.drools.guvnor.server.util.RowLoader;
+
import junit.framework.TestCase;
public class TableDisplayHandlerTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TestBean.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/brms/server/util/TestBean.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TestBean.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -1,4 +1,4 @@
-package org.drools.brms.server.util;
+package org.drools.guvnor.server.util;
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/remoting/gwt/GWTToSeamAdapterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/remoting/gwt/GWTToSeamAdapterTest.java 2008-06-19 00:52:45 UTC (rev 20603)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/remoting/gwt/GWTToSeamAdapterTest.java 2008-06-19 01:48:27 UTC (rev 20604)
@@ -21,8 +21,8 @@
import junit.framework.TestCase;
-import org.drools.brms.client.rpc.DetailedSerializableException;
-import org.drools.brms.client.rpc.SessionExpiredException;
+import org.drools.guvnor.client.rpc.DetailedSerializableException;
+import org.drools.guvnor.client.rpc.SessionExpiredException;
import org.jboss.seam.remoting.gwt.GWTToSeamAdapter.ReturnedObject;
public class GWTToSeamAdapterTest extends TestCase {
More information about the jboss-svn-commits
mailing list