[jboss-svn-commits] JBL Code SVN: r32832 - in labs/jbossrules/branches/drools_repo_services_diega_baunax: drools-guvnor/src/main/java/org/drools/guvnor/client/common and 40 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 11 16:34:43 EDT 2010
Author: baunax
Date: 2010-05-11 16:34:36 -0400 (Tue, 11 May 2010)
New Revision: 32832
Added:
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FactMetaModel.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FactModels.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FieldMetaModel.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ruleeditor/
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ruleeditor/PropertiesHolder.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ruleeditor/PropertyHolder.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/ElementContainerTransferNode.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/HumanTaskTransferNode.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/SplitTransferNode.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/TransferConnection.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/TransferNode.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/WorkItemTransferNode.java
Removed:
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/AssetFormats.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentAssemblyError.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPELHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BaseXStreamContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLDefinitionContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DecisionTableXLSHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DefaultContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/EnumerationContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FunctionContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ICanHasAttachment.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ICompilable.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/IValidating.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PlainTextContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ScenarioContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/TemplateModelHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/WorkingSetHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/XmlFileHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/Allow.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/AssetSelector.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/BuiltInSelector.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRDRTPersistence.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRDRTXMLPersistence.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/MetaDataMapper.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/PropertiesPersistence.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ElementContainerTransferNode.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FactMetaModel.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FactModels.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FieldMetaModel.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/HumanTaskTransferNode.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/PropertiesHolder.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/PropertyHolder.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/SplitTransferNode.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/TransferConnection.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/TransferNode.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/WorkItemTransferNode.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/RepositoryService.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryServicesImpl.java
Modified:
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/pom.xml
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DefaultContentUploadEditor.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ErrorPopup.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/DecisionTableXLSWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/RulesNewMenu.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/AssetAttachmentFileWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/ModelAttachmentFileWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisView.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FactUsagesItem.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioPackageView.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/TestRunnerWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierMessageLinesItem.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierResultWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/BulkTestRunResult.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ScenarioRunResult.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/AssetCategoryEditor.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/BPELWrapper.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DSLRuleEditor.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DrlEditor.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/FunctionEditor.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MultiViewEditor.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleDocumentWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowUploadWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleValidatorWrapper.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/SyntaxHighlightingEditor.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/XmlFileWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowConnectionFactory.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowNodeFactory.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowViewer.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/SplitNode.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/TransferRuleFlowNodeFactory.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AssetFileServlet.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/GuvnorDroolsDocsBuilder.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RulesRepositoryManager.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/SampleSaveEvent.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/UserInbox.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/AssetFormatHelper.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierReportCreator.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/EventsTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RepositoryStartupServiceTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/SampleSaveEventMock.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/BuiltInSelectorTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/VerifierRunnerTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/ide/common/server/rules/BRMSSuggestionCompletionLoaderTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/RuleFlowContentModel.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryStartupService.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/ContentPackageAssembler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/RuleFlowContentModelBuilder.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/RuleFlowProcessBuilder.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/DRLFileContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/FactModelContentHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/PropertiesHandler.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/selectors/RuleBasedSelector.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/selectors/SelectorManager.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/util/PropertiesPersistence.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/.classpath
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/.project
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/src/main/java/org/drools/repository/JackrabbitRepositoryConfigurator.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
Log:
moved classes to drools-repository-model and drools-repository-services
Property changes on: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor
___________________________________________________________________
Name: svn:ignore
- target
local
.metadata
.settings
.wtpmodules
nbproject
*.ipr
*.iws
*.iml
repository
tomcat
www
derby.log
repository.xml
+ target
local
.metadata
.settings
.wtpmodules
nbproject
*.ipr
*.iws
*.iml
repository
tomcat
www
derby.log
repository.xml
.gwt-tmp
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/pom.xml
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/pom.xml 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/pom.xml 2010-05-11 20:34:36 UTC (rev 32832)
@@ -148,6 +148,10 @@
</dependency>
<dependency>
<groupId>org.drools</groupId>
+ <artifactId>drools-repository-services</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/AssetFormats.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/AssetFormats.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/AssetFormats.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,103 +0,0 @@
-package org.drools.guvnor.client.common;
-/*
- * 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.
- */
-
-
-/**
- * Keeps track of the different rule formats we support.
- * Each format type corresponds to the dublin core "format" attribute.
- *
- * This is used both by the UI, to determine what are valid formats, and also on the server.
- * If you are adding new types they need to be registered here.
- *
- * If an asset type is unknown, then it will be opened with the default editor.
- *
- * @author Michael Neale
- */
-public class AssetFormats {
-
- /** For functions */
- public static final String FUNCTION = "function";
-
- /** For BPEL */
- public static final String BPEL_PACKAGE= "bpel.jar";
-
- /** For "model" assets */
- public static final String MODEL = "jar";
-
- /** For DSL language grammars */
- public static final String DSL = "dsl";
-
- /** Vanilla DRL "file" */
- public static final String DRL = "drl";
-
- /** Use the rule modeller */
- public static final String BUSINESS_RULE = "brl";
-
-
- /** use a DSL, free text editor */
- public static final String DSL_TEMPLATE_RULE = "dslr";
-
-
- /** Use a decision table.*/
- public static final String DECISION_SPREADSHEET_XLS = "xls";
-
- public static final String DECISION_TABLE_GUIDED = "gdst";
-
- /** Use a ruleflow.*/
- public static final String RULE_FLOW_RF = "rf";
- public static final String BPMN2_PROCESS = "bpmn";
-
- /** Use a data enum.*/
- public static final String ENUMERATION = "enumeration";
-
- /** For test scenarios. */
- public static final String TEST_SCENARIO = "scenario";
-
- /** For fact models in drl. */
- public static final String DRL_MODEL = "model.drl";
-
- public static final String XML = "xml";
-
- public static final String PROPERTIES = "properties";
-
- public static final String WORKING_SET = "workingset";
-
- public static final String RULE_TEMPLATE = "template";
-
- /**
- * The following group the assets together for lists, helpers etc...
- */
- public static final String[] BUSINESS_RULE_FORMATS = new String[]{AssetFormats.BUSINESS_RULE, AssetFormats.DSL_TEMPLATE_RULE, AssetFormats.DECISION_SPREADSHEET_XLS, AssetFormats.DECISION_TABLE_GUIDED, AssetFormats.RULE_TEMPLATE};
-
- /**
- * These define assets that are really package level "things". Used to decide when to flush any caches.
- */
- private static final String[] PACKAGE_DEPENCENCIES = new String[] {AssetFormats.FUNCTION, AssetFormats.DSL, AssetFormats.MODEL, AssetFormats.ENUMERATION, AssetFormats.DRL_MODEL, AssetFormats.WORKING_SET};
-
- /**
- * Will return true if the given asset format is a package dependency (eg a function, DSL, model etc).
- * Package dependencies are needed before the package is validated, and any rule assets are processed.
- */
- public static boolean isPackageDependency(String format) {
- for (String dep : PACKAGE_DEPENCENCIES) {
- if (dep.equals( format )) {
- return true;
- }
- }
- return false;
- }
-}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DefaultContentUploadEditor.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DefaultContentUploadEditor.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DefaultContentUploadEditor.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,12 +1,12 @@
package org.drools.guvnor.client.common;
+import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
-import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.RuleAsset;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.core.client.GWT;
public class DefaultContentUploadEditor extends AssetAttachmentFileWidget {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ErrorPopup.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ErrorPopup.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/ErrorPopup.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -18,7 +18,7 @@
import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.rpc.DetailedSerializableException;
+import org.drools.repository.model.client.exceptions.DetailedSerializableException;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.HTML;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import org.drools.guvnor.client.rpc.DetailedSerializableException;
+import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.SessionExpiredException;
-import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.exceptions.DetailedSerializableException;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.rpc.AsyncCallback;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/DecisionTableXLSWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/DecisionTableXLSWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/DecisionTableXLSWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -16,13 +16,13 @@
* limitations under the License.
*/
+import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
-import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.RuleAsset;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.core.client.GWT;
/**
* This widget deals with XLS files in "classic" decision tables.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -16,7 +16,6 @@
import org.drools.guvnor.client.modeldriven.ui.ActionValueEditor;
import org.drools.guvnor.client.modeldriven.ui.RuleAttributeWidget;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.ruleeditor.SaveEventListener;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
@@ -30,6 +29,7 @@
import org.drools.ide.common.client.modeldriven.dt.GuidedDecisionTable;
import org.drools.ide.common.client.modeldriven.dt.MetadataCol;
import org.drools.ide.common.client.modeldriven.ui.ConstraintValueEditorHelper;
+import org.drools.repository.model.client.RuleAsset;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,6 +1,5 @@
package org.drools.guvnor.client.explorer;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.common.Inbox;
import org.drools.guvnor.client.messages.Constants;
@@ -8,10 +7,10 @@
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.rpc.WorkingSetConfigData;
import org.drools.guvnor.client.ruleeditor.MultiViewRow;
import org.drools.guvnor.client.rulelist.EditItemEvent;
import org.drools.guvnor.client.security.Capabilities;
+import org.drools.repository.services.assets.AssetFormats;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Timer;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -4,7 +4,6 @@
import java.util.HashMap;
import java.util.Map;
-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;
@@ -14,7 +13,6 @@
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.GuvnorEditor;
import org.drools.guvnor.client.ruleeditor.MultiViewEditor;
@@ -22,6 +20,8 @@
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.rulelist.EditItemEvent;
import org.drools.guvnor.client.rulelist.QueryWidget;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.services.assets.AssetFormats;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,6 +1,5 @@
package org.drools.guvnor.client.explorer;
-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.RulePackageSelector;
@@ -16,6 +15,7 @@
import org.drools.guvnor.client.rulelist.AssetItemGrid;
import org.drools.guvnor.client.rulelist.AssetItemGridDataLoader;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.repository.services.assets.AssetFormats;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/RulesNewMenu.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/RulesNewMenu.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/RulesNewMenu.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,14 +1,14 @@
package org.drools.guvnor.client.explorer;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.services.assets.AssetFormats;
+import com.google.gwt.core.client.GWT;
import com.gwtext.client.core.EventObject;
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;
-import com.google.gwt.core.client.GWT;
/**
* TODO: this class should be generated via ant task: 'ant plug-editors'
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -12,11 +12,14 @@
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
import org.drools.guvnor.client.ruleeditor.DefaultRuleContentWidget;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.ruleeditor.SaveEventListener;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.RuleContentText;
+import org.drools.repository.model.client.factmodel.FactMetaModel;
+import org.drools.repository.model.client.factmodel.FactModels;
+import org.drools.repository.model.client.factmodel.FieldMetaModel;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -39,10 +39,7 @@
import org.drools.guvnor.client.modeldriven.HumanReadable;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
import org.drools.guvnor.client.packages.WorkingSetManager;
-import org.drools.guvnor.client.rpc.AnalysisReport;
-import org.drools.guvnor.client.rpc.AnalysisReportLine;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.security.Capabilities;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
@@ -65,6 +62,9 @@
import org.drools.ide.common.client.modeldriven.brl.RuleAttribute;
import org.drools.ide.common.client.modeldriven.brl.RuleMetadata;
import org.drools.ide.common.client.modeldriven.brl.RuleModel;
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.model.client.AnalysisReportLine;
+import org.drools.repository.model.client.RuleAsset;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleTemplateEditor.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -6,8 +6,8 @@
import org.drools.guvnor.client.common.DirtyableComposite;
import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.ide.common.client.modeldriven.dt.TemplateModel;
+import org.drools.repository.model.client.RuleAsset;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Label;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/AssetAttachmentFileWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/AssetAttachmentFileWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/AssetAttachmentFileWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -22,8 +22,8 @@
import org.drools.guvnor.client.common.LoadingPopup;
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
+import org.drools.repository.model.client.RuleAsset;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Window;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/ModelAttachmentFileWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/ModelAttachmentFileWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/ModelAttachmentFileWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -18,13 +18,13 @@
import org.drools.guvnor.client.common.LoadingPopup;
-import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.ruleeditor.SaveEventListener;
-import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.RuleAsset;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
-import com.google.gwt.core.client.GWT;
/**
* This wraps a file uploader utility for model packages.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -27,13 +27,13 @@
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.BuilderResultLine;
+import org.drools.guvnor.client.messages.Constants;
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 org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.BuilderResult;
+import org.drools.repository.model.client.BuilderResultLine;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
@@ -47,14 +47,12 @@
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.Label;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.RadioButton;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -66,13 +64,13 @@
import com.gwtext.client.data.RecordDef;
import com.gwtext.client.data.Store;
import com.gwtext.client.data.StringFieldDef;
+import com.gwtext.client.util.Format;
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.Renderer;
import com.gwtext.client.widgets.grid.event.GridRowListenerAdapter;
-import com.gwtext.client.util.Format;
/**
* This is the widget for building packages, validating etc. Visually decorates
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -11,8 +11,8 @@
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.modeldriven.SetFactTypeFilter;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.WorkingSetConfigData;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.WorkingSetConfigData;
import com.google.gwt.user.client.Command;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisView.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisView.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisView.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -3,11 +3,12 @@
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.messages.Constants;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rulelist.EditItemEvent;
-import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.AnalysisReport;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Composite;
@@ -15,7 +16,6 @@
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.core.client.GWT;
import com.gwtext.client.util.Format;
/**
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -2,13 +2,14 @@
import org.drools.guvnor.client.common.PrettyFormLayout;
import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.messages.Constants;
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 org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.BuilderResult;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
@@ -21,7 +22,6 @@
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.core.client.GWT;
import com.gwtext.client.util.Format;
/**
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FactUsagesItem.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FactUsagesItem.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FactUsagesItem.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,8 +1,8 @@
package org.drools.guvnor.client.qa;
-import org.drools.guvnor.client.rpc.AnalysisFactUsage;
-import org.drools.guvnor.client.rpc.AnalysisFieldUsage;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.AnalysisFactUsage;
+import org.drools.repository.model.client.AnalysisFieldUsage;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.HTML;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioPackageView.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioPackageView.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioPackageView.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,17 +1,18 @@
package org.drools.guvnor.client.qa;
-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.messages.Constants;
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 org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.services.assets.AssetFormats;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
@@ -19,7 +20,6 @@
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.core.client.GWT;
/**
* This shows a list of scenarios in a package.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,13 +1,19 @@
package org.drools.guvnor.client.qa;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
-import org.drools.guvnor.client.common.*;
+import org.drools.guvnor.client.common.DirtyableFlexTable;
+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.SmallLabel;
+import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
-import org.drools.guvnor.client.messages.Constants;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.ActivateRuleFlowGroup;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
@@ -17,7 +23,9 @@
import org.drools.ide.common.client.modeldriven.testing.Scenario;
import org.drools.ide.common.client.modeldriven.testing.VerifyFact;
import org.drools.ide.common.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.repository.model.client.RuleAsset;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
import com.google.gwt.user.client.Window;
@@ -35,7 +43,6 @@
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.google.gwt.core.client.GWT;
import com.gwtext.client.util.Format;
public class ScenarioWidget extends Composite {
@@ -43,7 +50,7 @@
private String[] availableRules;
private SuggestionCompletionEngine sce;
private ChangeListener ruleSelectionCL;
- RuleAsset asset;
+ public RuleAsset asset;
VerticalPanel layout;
boolean showResults;
private Constants constants = ((Constants) GWT.create(Constants.class));
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/TestRunnerWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/TestRunnerWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/TestRunnerWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,22 +1,38 @@
package org.drools.guvnor.client.qa;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.*;
-import com.gwtext.client.util.Format;
+import java.util.Iterator;
+import java.util.List;
+
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.common.LoadingPopup;
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.rpc.BuilderResult;
-import org.drools.guvnor.client.rpc.BuilderResultLine;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rpc.ScenarioRunResult;
import org.drools.guvnor.client.rpc.SingleScenarioResult;
-import org.drools.ide.common.client.modeldriven.testing.*;
+import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
+import org.drools.ide.common.client.modeldriven.testing.Fixture;
+import org.drools.ide.common.client.modeldriven.testing.Scenario;
+import org.drools.ide.common.client.modeldriven.testing.VerifyFact;
+import org.drools.ide.common.client.modeldriven.testing.VerifyField;
+import org.drools.ide.common.client.modeldriven.testing.VerifyRuleFired;
+import org.drools.repository.model.client.BuilderResultLine;
-import java.util.Iterator;
-import java.util.List;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.Window;
+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.FlexTable;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.ScrollPanel;
+import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
+import com.gwtext.client.util.Format;
/**
* Created by IntelliJ IDEA.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierMessageLinesItem.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierMessageLinesItem.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierMessageLinesItem.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,9 +1,9 @@
package org.drools.guvnor.client.qa;
import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.rpc.AnalysisReportLine;
-import org.drools.guvnor.client.rpc.Cause;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.repository.model.client.AnalysisReportLine;
+import org.drools.repository.model.client.Cause;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.ClickListener;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierResultWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierResultWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierResultWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -2,9 +2,9 @@
import org.drools.guvnor.client.common.FormStyleLayout;
import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.rpc.AnalysisReport;
-import org.drools.guvnor.client.rpc.AnalysisReportLine;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.model.client.AnalysisReportLine;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Composite;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/BulkTestRunResult.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/BulkTestRunResult.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/BulkTestRunResult.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,5 +1,7 @@
package org.drools.guvnor.client.rpc;
+import org.drools.repository.model.client.BuilderResult;
+
import com.google.gwt.user.client.rpc.IsSerializable;
/**
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -23,9 +23,13 @@
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.Scenario;
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.model.client.BuilderResult;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.exceptions.DetailedSerializableException;
+import org.drools.repository.model.client.exceptions.SerializableException;
import com.google.gwt.user.client.rpc.RemoteService;
-import org.drools.repository.model.client.exceptions.SerializableException;
/**
* This is what the remote service will implement, as a servlet.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,4 +1,9 @@
package org.drools.guvnor.client.rpc;
+
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.model.client.BuilderResult;
+import org.drools.repository.model.client.RuleAsset;
+
/*
* Copyright 2005 JBoss Inc
*
@@ -17,10 +22,7 @@
-import org.drools.guvnor.client.common.GenericCallback;
-import com.google.gwt.user.client.rpc.RemoteService;
-
/**
*
* This is what the remote service will implement, as a servlet.
@@ -35,17 +37,17 @@
/** Generated by AsyncInterfaceGenerator hackery */
void addToDiscussionForAsset(java.lang.String assetId, java.lang.String comment, com.google.gwt.user.client.rpc.AsyncCallback<java.util.List<org.drools.guvnor.client.rpc.DiscussionRecord>> arg3);
- void analysePackage(java.lang.String packageUUID, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.AnalysisReport> arg2);
+ void analysePackage(java.lang.String packageUUID, com.google.gwt.user.client.rpc.AsyncCallback<AnalysisReport> arg2);
void archiveAsset(java.lang.String uuid, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg3);
void unArchiveAsset(java.lang.String uuid, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg3);
void archiveAssets(java.lang.String[] uuids, boolean value, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg3);
- void buildAsset(org.drools.guvnor.client.rpc.RuleAsset asset, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.BuilderResult> arg2);
- void buildAssetSource(org.drools.guvnor.client.rpc.RuleAsset asset, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.String> arg2);
- void buildPackage(java.lang.String packageUUID, boolean force, java.lang.String buildMode, java.lang.String operator, java.lang.String statusDescriptionValue, boolean enableStatusSelector, java.lang.String categoryOperator, java.lang.String category, boolean enableCategorySelector, java.lang.String customSelectorName, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.BuilderResult> arg11);
+ void buildAsset(org.drools.repository.model.client.RuleAsset asset, com.google.gwt.user.client.rpc.AsyncCallback<BuilderResult> arg2);
+ void buildAssetSource(org.drools.repository.model.client.RuleAsset asset, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.String> arg2);
+ void buildPackage(java.lang.String packageUUID, boolean force, java.lang.String buildMode, java.lang.String operator, java.lang.String statusDescriptionValue, boolean enableStatusSelector, java.lang.String categoryOperator, java.lang.String category, boolean enableCategorySelector, java.lang.String customSelectorName, com.google.gwt.user.client.rpc.AsyncCallback<BuilderResult> arg11);
void buildPackageSource(java.lang.String packageUUID, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.String> arg2);
void changeAssetPackage(java.lang.String uuid, java.lang.String newPackage, java.lang.String comment, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg4);
void changeState(java.lang.String uuid, java.lang.String newState, boolean wholePackage, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg4);
- void checkinVersion(org.drools.guvnor.client.rpc.RuleAsset asset, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.String> arg2);
+ void checkinVersion(org.drools.repository.model.client.RuleAsset asset, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.String> arg2);
void cleanLog(com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg1);
void clearAllDiscussionsForAsset(java.lang.String assetId, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg2);
void clearRulesRepository(com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg1);
@@ -83,8 +85,8 @@
void loadGlobalPackage(com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.PackageConfigData> arg1);
void loadInbox(java.lang.String inboxName, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg2);
void loadPackageConfig(java.lang.String uuid, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.PackageConfigData> arg2);
- void loadRuleAsset(java.lang.String UUID, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.RuleAsset> arg2);
- void loadRuleAssets(java.lang.String[] UUIDs, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.RuleAsset[]> arg2);
+ void loadRuleAsset(java.lang.String UUID, com.google.gwt.user.client.rpc.AsyncCallback<RuleAsset> arg2);
+ void loadRuleAssets(java.lang.String[] UUIDs, com.google.gwt.user.client.rpc.AsyncCallback<RuleAsset[]> arg2);
void loadRuleListForCategories(java.lang.String categoryPath, int skip, int numRows, java.lang.String tableConfig, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg5);
void loadRuleListForState(java.lang.String state, int skip, int numRows, java.lang.String tableConfig, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.TableDataResult> arg5);
void loadSuggestionCompletionEngine(java.lang.String packageName, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine> arg2);
@@ -114,6 +116,6 @@
void subscribe(com.google.gwt.user.client.rpc.AsyncCallback<java.util.List<org.drools.guvnor.client.rpc.PushResponse>> arg1);
void unLockAsset(java.lang.String uuid, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg2);
void updateUserPermissions(java.lang.String userName, java.util.Map<java.lang.String, java.util.List<java.lang.String>> perms, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg3);
- void verifyAsset(org.drools.guvnor.client.rpc.RuleAsset asset, java.util.Set<String> sactiveWorkingSets, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.AnalysisReport> arg2);
- void verifyAssetWithoutVerifiersRules(org.drools.guvnor.client.rpc.RuleAsset asset, java.util.Set<String> sactiveWorkingSets, com.google.gwt.user.client.rpc.AsyncCallback<org.drools.guvnor.client.rpc.AnalysisReport> arg2);
+ void verifyAsset(RuleAsset asset, java.util.Set<String> sactiveWorkingSets, com.google.gwt.user.client.rpc.AsyncCallback<AnalysisReport> arg2);
+ void verifyAssetWithoutVerifiersRules(RuleAsset asset, java.util.Set<String> sactiveWorkingSets, com.google.gwt.user.client.rpc.AsyncCallback<AnalysisReport> arg2);
}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ScenarioRunResult.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ScenarioRunResult.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/ScenarioRunResult.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,6 +1,7 @@
package org.drools.guvnor.client.rpc;
import org.drools.ide.common.client.modeldriven.testing.Scenario;
+import org.drools.repository.model.client.BuilderResultLine;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -18,35 +18,45 @@
import java.util.Set;
+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.SmallLabel;
+import org.drools.guvnor.client.common.StatusChangePopup;
+import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
+import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.modeldriven.ui.RuleModelEditor;
+import org.drools.guvnor.client.modeldriven.ui.RuleModeller;
+import org.drools.guvnor.client.packages.PackageBuilderWidget;
+import org.drools.guvnor.client.packages.WorkingSetManager;
+import org.drools.guvnor.client.qa.VerifierResultWidget;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.security.Capabilities;
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.model.client.BuilderResult;
+import org.drools.repository.model.client.RuleAsset;
+
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.*;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.ScrollPanel;
+import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.util.Format;
-import com.gwtext.client.widgets.*;
+import com.gwtext.client.widgets.QuickTipsConfig;
+import com.gwtext.client.widgets.Toolbar;
+import com.gwtext.client.widgets.ToolbarButton;
+import com.gwtext.client.widgets.ToolbarMenuButton;
+import com.gwtext.client.widgets.ToolbarTextItem;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+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.Item;
-import com.gwtext.client.widgets.menu.BaseItem;
import com.gwtext.client.widgets.menu.event.BaseItemListenerAdapter;
-import com.gwtext.client.widgets.event.ButtonListenerAdapter;
-import org.drools.guvnor.client.common.*;
-import static org.drools.guvnor.client.common.AssetFormats.*;
-import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.qa.VerifierResultWidget;
-import org.drools.guvnor.client.rpc.AnalysisReport;
-import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.BuilderResult;
-import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
-import org.drools.guvnor.client.modeldriven.ui.RuleModelEditor;
-import org.drools.guvnor.client.modeldriven.ui.RuleModeller;
-import org.drools.guvnor.client.security.Capabilities;
-import org.drools.guvnor.client.packages.PackageBuilderWidget;
-import org.drools.guvnor.client.packages.WorkingSetManager;
-
+import static org.drools.repository.services.assets.AssetFormats.*;
/**
* This contains the widgets used to action a rule asset
* (ie checkin, change state, close window)
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/AssetCategoryEditor.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/AssetCategoryEditor.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/AssetCategoryEditor.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -24,16 +24,16 @@
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.rpc.MetaData;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.MetaData;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.core.client.GWT;
/**
* This is a viewer/editor for categories.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/BPELWrapper.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/BPELWrapper.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/BPELWrapper.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -3,7 +3,7 @@
import org.drools.guvnor.client.common.DefaultContentUploadEditor;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
-import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.repository.model.client.RuleAsset;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Window;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DSLRuleEditor.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DSLRuleEditor.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DSLRuleEditor.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -18,13 +18,14 @@
import org.drools.guvnor.client.common.DirtyableComposite;
import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
-import org.drools.guvnor.client.messages.Constants;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.DSLSentence;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.RuleContentText;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.FlexTable;
@@ -35,7 +36,6 @@
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.core.client.GWT;
/**
* This is a textual rule editor, which provides DSL content assistance. This is
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -17,8 +17,8 @@
*/
import org.drools.guvnor.client.common.DirtyableComposite;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.RuleContentText;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.KeyboardListenerAdapter;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,6 +1,25 @@
package org.drools.guvnor.client.ruleeditor;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.explorer.CategoriesPanel;
+import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
+import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.rpc.DiscussionRecord;
+import org.drools.guvnor.client.rpc.PushClient;
+import org.drools.guvnor.client.rpc.PushResponse;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.ServerPushNotification;
+import org.drools.guvnor.client.security.Capabilities;
+import org.drools.repository.model.client.RuleAsset;
+
import com.google.gwt.core.client.GWT;
+import com.google.gwt.http.client.URL;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Composite;
@@ -12,27 +31,9 @@
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.http.client.URL;
import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.Panel;
-import org.drools.guvnor.client.common.GenericCallback;
-import org.drools.guvnor.client.common.SmallLabel;
-import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.rpc.DiscussionRecord;
-import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.PushClient;
-import org.drools.guvnor.client.rpc.ServerPushNotification;
-import org.drools.guvnor.client.rpc.PushResponse;
-import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
-import org.drools.guvnor.client.explorer.CategoriesPanel;
-import org.drools.guvnor.client.security.Capabilities;
-import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-
/**
*
* Does the discussion panel for assets.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DrlEditor.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DrlEditor.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DrlEditor.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,8 +1,8 @@
package org.drools.guvnor.client.ruleeditor;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.ruleeditor.FactTypeBrowser.ClickEvent;
+import org.drools.repository.model.client.RuleAsset;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Grid;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -19,7 +19,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.common.DefaultContentUploadEditor;
import org.drools.guvnor.client.common.RulePackageSelector;
import org.drools.guvnor.client.decisiontable.DecisionTableXLSWidget;
@@ -31,7 +30,8 @@
import org.drools.guvnor.client.modeldriven.ui.RuleTemplateEditor;
import org.drools.guvnor.client.packages.ModelAttachmentFileWidget;
import org.drools.guvnor.client.qa.ScenarioWidget;
-import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.services.assets.AssetFormats;
import com.google.gwt.user.client.ui.Widget;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/FunctionEditor.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/FunctionEditor.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/FunctionEditor.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,6 +1,6 @@
package org.drools.guvnor.client.ruleeditor;
-import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.repository.model.client.RuleAsset;
import com.google.gwt.user.client.ui.Composite;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -18,12 +18,18 @@
import java.util.Date;
-import org.drools.guvnor.client.common.*;
+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.ImageButton;
+import org.drools.guvnor.client.common.RulePackageSelector;
+import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.rpc.MetaData;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.security.Capabilities;
+import org.drools.repository.model.client.MetaData;
+import org.drools.repository.services.assets.AssetFormats;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
@@ -41,8 +47,6 @@
import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.form.FormPanel;
-import com.gwtext.client.widgets.form.event.FormPanelListener;
-import com.gwtext.client.widgets.form.event.FormPanelListenerAdapter;
/**
* This displays the metadata for a versionable asset.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MultiViewEditor.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MultiViewEditor.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MultiViewEditor.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -6,16 +6,14 @@
import java.util.Set;
import org.drools.guvnor.client.common.GenericCallback;
-import org.drools.guvnor.client.common.LoadingPopup;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.repository.model.client.RuleAsset;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.Panel;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -19,7 +19,6 @@
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.FormStyleLayout;
import org.drools.guvnor.client.common.FormStylePopup;
import org.drools.guvnor.client.common.GenericCallback;
@@ -29,6 +28,7 @@
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.repository.services.assets.AssetFormats;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -18,10 +18,13 @@
import java.util.ArrayList;
import java.util.List;
+import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.ruleeditor.PropertiesHolder;
+import org.drools.repository.model.client.ruleeditor.PropertyHolder;
+import com.google.gwt.core.client.GWT;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.data.ArrayReader;
import com.gwtext.client.data.FieldDef;
@@ -40,7 +43,6 @@
import com.gwtext.client.widgets.grid.ColumnModel;
import com.gwtext.client.widgets.grid.EditorGridPanel;
import com.gwtext.client.widgets.grid.GridEditor;
-import com.google.gwt.core.client.GWT;
/**
* Properties (key/value pairs) editor with a file attachment.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleDocumentWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleDocumentWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleDocumentWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -16,17 +16,19 @@
*/
+import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.MetaData;
+import org.drools.repository.model.client.RuleAsset;
+
import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.*;
+import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
-import com.google.gwt.user.client.Command;
-import com.gwtext.client.widgets.Toolbar;
-import com.gwtext.client.widgets.ToolbarTextItem;
+import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.user.client.ui.TextArea;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.widgets.Panel;
-import org.drools.guvnor.client.common.DirtyableComposite;
-import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.rpc.MetaData;
-import org.drools.guvnor.client.rpc.RuleAsset;
/**
* This holds the editor and viewer for rule documentation.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowUploadWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowUploadWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowUploadWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -17,12 +17,12 @@
+import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.RuleAsset;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.core.client.GWT;
/**
* For ruleflow upload.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -4,17 +4,17 @@
import org.drools.guvnor.client.common.FormStyleLayout;
import org.drools.guvnor.client.common.FormStylePopup;
import org.drools.guvnor.client.common.LoadingPopup;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleFlowContentModel;
-import org.drools.guvnor.client.rulefloweditor.RuleFlowViewer;
import org.drools.guvnor.client.explorer.Preferences;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.rulefloweditor.RuleFlowViewer;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.RuleFlowContentModel;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.core.client.GWT;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.Panel;
import com.gwtext.client.widgets.Toolbar;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleValidatorWrapper.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleValidatorWrapper.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleValidatorWrapper.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -22,25 +22,22 @@
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.common.LoadingPopup;
import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
+import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.PackageBuilderWidget;
-import org.drools.guvnor.client.rpc.BuilderResult;
-import org.drools.guvnor.client.rpc.BuilderResultLine;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.messages.Constants;
-import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
import org.drools.guvnor.client.security.Capabilities;
+import org.drools.repository.model.client.BuilderResult;
+import org.drools.repository.model.client.BuilderResultLine;
+import org.drools.repository.model.client.RuleAsset;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.FlexTable;
-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.ScrollPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.core.client.GWT;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.Toolbar;
import com.gwtext.client.widgets.ToolbarButton;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-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;
@@ -26,8 +25,9 @@
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.services.assets.AssetFormats;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/SyntaxHighlightingEditor.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/SyntaxHighlightingEditor.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/SyntaxHighlightingEditor.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -17,8 +17,8 @@
*/
import org.drools.guvnor.client.common.DirtyableComposite;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.RuleContentText;
import com.google.gwt.user.client.ui.HTML;
import com.gwtext.client.core.Ext;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -24,14 +24,15 @@
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.messages.Constants;
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 org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.MetaData;
+import org.drools.repository.model.client.RuleAsset;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
import com.google.gwt.user.client.ui.Button;
@@ -45,7 +46,6 @@
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
-import com.google.gwt.core.client.GWT;
import com.gwtext.client.util.Format;
/**
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -11,15 +11,15 @@
import org.drools.factconstraints.client.ConstraintConfiguration;
import org.drools.factconstraints.client.helper.ConstraintsContainer;
-import org.drools.guvnor.client.common.AssetFormats;
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.messages.Constants;
import org.drools.guvnor.client.packages.SuggestionCompletionCache;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.WorkingSetConfigData;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.WorkingSetConfigData;
+import org.drools.repository.services.assets.AssetFormats;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Button;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -16,14 +16,16 @@
*/
-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.messages.Constants;
+import org.drools.guvnor.client.modeldriven.ui.RuleModeller;
+import org.drools.guvnor.client.packages.WorkingSetManager;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.rpc.TableDataResult;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.services.assets.AssetFormats;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
@@ -32,8 +34,6 @@
import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.widgets.tree.TreeNode;
import com.gwtext.client.widgets.tree.TreePanel;
-import org.drools.guvnor.client.modeldriven.ui.RuleModeller;
-import org.drools.guvnor.client.packages.WorkingSetManager;
public class WorkingSetSelectorPopup {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/XmlFileWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/XmlFileWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/XmlFileWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,8 +1,8 @@
package org.drools.guvnor.client.ruleeditor;
import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.RuleContentText;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.TextArea;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowConnectionFactory.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowConnectionFactory.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowConnectionFactory.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -18,6 +18,8 @@
import java.util.Map;
+import org.drools.repository.model.client.rulefloweditor.TransferConnection;
+
import pl.balon.gwt.diagrams.client.connection.Connection;
import pl.balon.gwt.diagrams.client.connection.RectilinearTwoEndedConnection;
import pl.balon.gwt.diagrams.client.connector.UIObjectConnector;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowNodeFactory.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowNodeFactory.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowNodeFactory.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -18,7 +18,13 @@
import org.cobogw.gwt.user.client.ui.RoundedPanel;
import org.drools.guvnor.client.rulefloweditor.RuleFlowBaseNode.Corners;
-import org.drools.guvnor.client.rulefloweditor.TransferNode.Type;
+import org.drools.repository.model.client.rulefloweditor.ElementContainerTransferNode;
+import org.drools.repository.model.client.rulefloweditor.HumanTaskTransferNode;
+import org.drools.repository.model.client.rulefloweditor.SplitTransferNode;
+import org.drools.repository.model.client.rulefloweditor.TransferConnection;
+import org.drools.repository.model.client.rulefloweditor.TransferNode;
+import org.drools.repository.model.client.rulefloweditor.WorkItemTransferNode;
+import org.drools.repository.model.client.rulefloweditor.TransferNode.Type;
import pl.balon.gwt.diagrams.client.connection.Connection;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowViewer.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowViewer.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowViewer.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -22,7 +22,9 @@
import java.util.Map;
import org.drools.guvnor.client.common.FormStyleLayout;
-import org.drools.guvnor.client.rpc.RuleFlowContentModel;
+import org.drools.repository.model.client.RuleFlowContentModel;
+import org.drools.repository.model.client.rulefloweditor.TransferConnection;
+import org.drools.repository.model.client.rulefloweditor.TransferNode;
import pl.balon.gwt.diagrams.client.connection.Connection;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/SplitNode.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/SplitNode.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/SplitNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -27,12 +27,15 @@
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.core.client.GWT;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.repository.model.client.SplitConnectionRef;
+import org.drools.repository.model.client.SplitConstraint;
+import org.drools.repository.model.client.rulefloweditor.SplitTransferNode;
public class SplitNode extends RuleFlowBaseNode {
SplitTransferNode.Type type;
- public Map<ConnectionRef, Constraint> constraints;
+ public Map<SplitConnectionRef, SplitConstraint> constraints;
private Constants constants = ((Constants) GWT.create(Constants.class));
@Override
@@ -63,9 +66,9 @@
parametersForm.addAttribute(constants.Type2(),
new Label( type.toString() ) );
- for ( final ConnectionRef connectionRef : constraints.keySet() ) {
+ for ( final SplitConnectionRef SplitConnectionRef : constraints.keySet() ) {
- final Constraint constraint = constraints.get( connectionRef );
+ final SplitConstraint constraint = constraints.get( SplitConnectionRef );
final TextBox priorityTextBox = new TextBox();
priorityTextBox.setWidth( "30px" );
@@ -78,9 +81,9 @@
public void onLostFocus(Widget arg1) {
- final Constraint constraint = constraints.get( connectionRef );
+ final SplitConstraint constraint = constraints.get( SplitConnectionRef );
constraint.setPriority( Integer.parseInt( priorityTextBox.getText() ) );
- constraints.put( connectionRef,
+ constraints.put( SplitConnectionRef,
constraint );
}
} );
@@ -96,9 +99,9 @@
public void onLostFocus(Widget arg1) {
- final Constraint constraint = constraints.get( connectionRef );
+ final SplitConstraint constraint = constraints.get( SplitConnectionRef );
constraint.setConstraint( constraintTextBox.getText() );
- constraints.put( connectionRef,
+ constraints.put( SplitConnectionRef,
constraint );
}
} );
@@ -114,93 +117,4 @@
}
}
}
-
- public static class Constraint
- implements
- IsSerializable {
-
- private String constraint;
- private String dialect;
- private int priority;
- private String name;
- private String type;
-
- public String getConstraint() {
- return this.constraint;
- }
-
- public String getDialect() {
- return this.dialect;
- }
-
- public String getName() {
- return this.name;
- }
-
- public int getPriority() {
- return this.priority;
- }
-
- public String getType() {
- return this.type;
- }
-
- public void setConstraint(String constraint) {
- this.constraint = constraint;
- }
-
- public void setDialect(String dialect) {
- this.dialect = dialect;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setPriority(int priority) {
- this.priority = priority;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- }
-
- public static class ConnectionRef
- implements
- IsSerializable {
-
- private String toType;
- private long nodeId;
-
- public void setToType(String toType) {
- this.toType = toType;
- }
-
- public void setNodeId(long nodeId) {
- this.nodeId = nodeId;
- }
-
- public String getToType() {
- return toType;
- }
-
- public long getNodeId() {
- return nodeId;
- }
-
- public boolean equals(Object o) {
- if ( o instanceof ConnectionRef ) {
- ConnectionRef c = (ConnectionRef) o;
- return toType.equals( c.toType ) && nodeId == c.nodeId;
- }
- return false;
- }
-
- public int hashCode() {
- return 7 * toType.hashCode() + (int) nodeId;
- }
-
- }
}
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/TransferRuleFlowNodeFactory.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/TransferRuleFlowNodeFactory.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/TransferRuleFlowNodeFactory.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -19,8 +19,13 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.guvnor.client.rpc.RuleFlowContentModel;
-import org.drools.guvnor.client.rulefloweditor.TransferNode.Type;
+import org.drools.repository.model.client.RuleFlowContentModel;
+import org.drools.repository.model.client.rulefloweditor.ElementContainerTransferNode;
+import org.drools.repository.model.client.rulefloweditor.HumanTaskTransferNode;
+import org.drools.repository.model.client.rulefloweditor.SplitTransferNode;
+import org.drools.repository.model.client.rulefloweditor.TransferNode;
+import org.drools.repository.model.client.rulefloweditor.WorkItemTransferNode;
+import org.drools.repository.model.client.rulefloweditor.TransferNode.Type;
public class TransferRuleFlowNodeFactory {
@@ -141,6 +146,8 @@
tn = new WorkItemTransferNode();
tn.setWorkName( WorkItemNode.LOG );
+ } else {
+ throw new RuntimeException("unknown node type: " + node.getClass().getName());
}
tn.setParameters( node.attributes );
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -22,18 +22,35 @@
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.*;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.packages.SuggestionCompletionCache;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.TableDataResult;
+import org.drools.guvnor.client.rpc.TableDataRow;
import org.drools.guvnor.client.ruleeditor.EditorLauncher;
-import org.drools.guvnor.client.packages.SuggestionCompletionCache;
+import org.drools.repository.model.client.RuleAsset;
-import com.google.gwt.user.client.ui.*;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.CheckBox;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.KeyboardListener;
+import com.google.gwt.user.client.ui.KeyboardListenerAdapter;
+import com.google.gwt.user.client.ui.ScrollListener;
+import com.google.gwt.user.client.ui.ScrollPanel;
+import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.SuggestBox;
+import com.google.gwt.user.client.ui.SuggestOracle;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.SuggestOracle.Callback;
import com.google.gwt.user.client.ui.SuggestOracle.Request;
-import com.google.gwt.user.client.Command;
-import com.google.gwt.core.client.GWT;
/**
* This is for quickly finding an asset by name. Partial completion is allowed.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -6,20 +6,22 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
-import org.drools.guvnor.client.rpc.AnalysisReport;
import org.drools.guvnor.client.rpc.RepositoryService;
-import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.server.repository.MailboxService;
import org.drools.guvnor.server.repository.RepositoryStartupService;
import org.drools.guvnor.server.util.LoggingHelper;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.RulesRepository;
import org.drools.repository.RulesRepositoryException;
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.model.client.BuilderResult;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.exceptions.DetailedSerializableException;
+import org.drools.repository.model.client.exceptions.SerializableException;
import org.jboss.seam.Component;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.security.AuthorizationException;
-import org.drools.repository.model.client.exceptions.SerializableException;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
/**
@@ -138,10 +140,10 @@
public org.drools.guvnor.client.rpc.PackageConfigData[] listArchivedPackages() {
return getService().listArchivedPackages();
}
- public org.drools.guvnor.client.rpc.RuleAsset loadRuleAsset(java.lang.String p0) throws SerializableException {
+ public RuleAsset loadRuleAsset(java.lang.String p0) throws SerializableException {
return getService().loadRuleAsset( p0);
}
- public org.drools.guvnor.client.rpc.RuleAsset[] loadRuleAssets(java.lang.String[] p0) throws SerializableException {
+ public RuleAsset[] loadRuleAssets(java.lang.String[] p0) throws SerializableException {
return getService().loadRuleAssets( p0);
}
public org.drools.guvnor.client.rpc.TableDataResult loadAssetHistory(java.lang.String p0) throws SerializableException {
@@ -150,7 +152,7 @@
public org.drools.guvnor.client.rpc.TableDataResult loadArchivedAssets(int p0, int p1) throws SerializableException {
return getService().loadArchivedAssets( p0, p1);
}
- public java.lang.String checkinVersion(org.drools.guvnor.client.rpc.RuleAsset p0) throws SerializableException {
+ public java.lang.String checkinVersion(RuleAsset p0) throws SerializableException {
return getService().checkinVersion( p0);
}
public void restoreVersion(java.lang.String p0, java.lang.String p1, java.lang.String p2) {
@@ -219,7 +221,7 @@
public org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine loadSuggestionCompletionEngine(java.lang.String p0) throws SerializableException {
return getService().loadSuggestionCompletionEngine( p0);
}
- public org.drools.guvnor.client.rpc.BuilderResult buildPackage(java.lang.String p0, boolean p1, java.lang.String p2, java.lang.String p3, java.lang.String p4, boolean p5, java.lang.String p6, java.lang.String p7, boolean p8, java.lang.String p9) throws SerializableException {
+ public BuilderResult buildPackage(java.lang.String p0, boolean p1, java.lang.String p2, java.lang.String p3, java.lang.String p4, boolean p5, java.lang.String p6, java.lang.String p7, boolean p8, java.lang.String p9) throws SerializableException {
return getService().buildPackage( p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
}
public java.lang.String[] getCustomSelectors() throws SerializableException {
@@ -228,10 +230,10 @@
public java.lang.String buildPackageSource(java.lang.String p0) throws SerializableException {
return getService().buildPackageSource( p0);
}
- public java.lang.String buildAssetSource(org.drools.guvnor.client.rpc.RuleAsset p0) throws SerializableException {
+ public java.lang.String buildAssetSource(RuleAsset p0) throws SerializableException {
return getService().buildAssetSource( p0);
}
- public org.drools.guvnor.client.rpc.BuilderResult buildAsset(org.drools.guvnor.client.rpc.RuleAsset p0) throws SerializableException {
+ public BuilderResult buildAsset(RuleAsset p0) throws SerializableException {
return getService().buildAsset( p0);
}
public java.lang.String renameAsset(java.lang.String p0, java.lang.String p1) {
@@ -276,7 +278,7 @@
public org.drools.guvnor.client.rpc.BulkTestRunResult runScenariosInPackage(java.lang.String p0) throws SerializableException {
return getService().runScenariosInPackage( p0);
}
- public org.drools.guvnor.client.rpc.AnalysisReport analysePackage(java.lang.String p0) throws SerializableException {
+ public AnalysisReport analysePackage(java.lang.String p0) throws SerializableException {
return getService().analysePackage( p0);
}
public java.lang.String[] listTypesInPackage(java.lang.String p0) throws SerializableException {
@@ -297,7 +299,7 @@
public org.drools.guvnor.client.rpc.TableDataResult queryMetaData(org.drools.guvnor.client.rpc.MetaDataQuery[] p0, java.util.Date p1, java.util.Date p2, java.util.Date p3, java.util.Date p4, boolean p5, int p6, int p7) throws SerializableException {
return getService().queryMetaData( p0, p1, p2, p3, p4, p5, p6, p7);
}
- public java.util.Map listUserPermissions() throws org.drools.guvnor.client.rpc.DetailedSerializableException {
+ public java.util.Map listUserPermissions() throws DetailedSerializableException {
return getService().listUserPermissions();
}
public java.util.Map retrieveUserPermissions(java.lang.String p0) {
@@ -339,7 +341,7 @@
public java.util.List subscribe() {
return getService().subscribe();
}
- public org.drools.guvnor.client.rpc.TableDataResult loadInbox(java.lang.String p0) throws org.drools.guvnor.client.rpc.DetailedSerializableException {
+ public org.drools.guvnor.client.rpc.TableDataResult loadInbox(java.lang.String p0) throws DetailedSerializableException {
return getService().loadInbox( p0);
}
public org.drools.guvnor.client.rpc.SnapshotDiffs compareSnapshots(java.lang.String p0, java.lang.String p1, java.lang.String p2) {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -61,21 +61,13 @@
import org.drools.core.util.DroolsStreamUtils;
import org.drools.factconstraints.client.ConstraintConfiguration;
import org.drools.factconstraints.server.factory.ConstraintsFactory;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.common.Inbox;
-import org.drools.guvnor.client.rpc.AnalysisReport;
-import org.drools.guvnor.client.rpc.BuilderResult;
-import org.drools.guvnor.client.rpc.BuilderResultLine;
import org.drools.guvnor.client.rpc.BulkTestRunResult;
-import org.drools.guvnor.client.rpc.DetailedSerializableException;
import org.drools.guvnor.client.rpc.DiscussionRecord;
import org.drools.guvnor.client.rpc.LogEntry;
-import org.drools.guvnor.client.rpc.MetaData;
import org.drools.guvnor.client.rpc.MetaDataQuery;
import org.drools.guvnor.client.rpc.PackageConfigData;
import org.drools.guvnor.client.rpc.PushResponse;
-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.SingleScenarioResult;
@@ -86,17 +78,7 @@
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.rpc.WorkingSetConfigData;
import org.drools.guvnor.server.builder.AuditLogReporter;
-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.ICanHasAttachment;
-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.repository.MailboxService;
import org.drools.guvnor.server.repository.UserInbox;
import org.drools.guvnor.server.security.AdminType;
@@ -104,13 +86,11 @@
import org.drools.guvnor.server.security.PackageNameType;
import org.drools.guvnor.server.security.PackageUUIDType;
import org.drools.guvnor.server.security.RoleTypes;
-import org.drools.guvnor.server.selector.SelectorManager;
import org.drools.guvnor.server.util.AssetFormatHelper;
import org.drools.guvnor.server.util.AssetLockManager;
import org.drools.guvnor.server.util.BRMSSuggestionCompletionLoader;
import org.drools.guvnor.server.util.Discussion;
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.ide.common.client.modeldriven.SuggestionCompletionEngine;
@@ -131,7 +111,28 @@
import org.drools.repository.StateItem;
import org.drools.repository.VersionableItem;
import org.drools.repository.RulesRepository.DateQuery;
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.model.client.BuilderResult;
+import org.drools.repository.model.client.BuilderResultLine;
+import org.drools.repository.model.client.MetaData;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.WorkingSetConfigData;
+import org.drools.repository.model.client.exceptions.DetailedSerializableException;
+import org.drools.repository.model.client.exceptions.SerializableException;
import org.drools.repository.security.PermissionManager;
+import org.drools.repository.services.ContentManager;
+import org.drools.guvnor.client.rpc.RepositoryService;
+import org.drools.repository.services.assets.AssetFormats;
+import org.drools.repository.services.internal.builder.BRMSPackageBuilder;
+import org.drools.repository.services.internal.builder.ContentAssemblyError;
+import org.drools.repository.services.internal.builder.ContentPackageAssembler;
+import org.drools.repository.services.internal.contenthandlers.ContentHandler;
+import org.drools.repository.services.internal.contenthandlers.ICanHasAttachment;
+import org.drools.repository.services.internal.contenthandlers.IRuleAsset;
+import org.drools.repository.services.internal.contenthandlers.IValidating;
+import org.drools.repository.services.internal.contenthandlers.ModelContentHandler;
+import org.drools.repository.services.internal.selectors.SelectorManager;
+import org.drools.repository.services.internal.util.MetaDataMapper;
import org.drools.rule.Package;
import org.drools.runtime.rule.ConsequenceException;
import org.drools.testframework.RuleCoverageListener;
@@ -147,8 +148,6 @@
import org.mvel2.MVEL;
import org.mvel2.templates.TemplateRuntime;
-import org.drools.repository.model.client.exceptions.SerializableException;
-
/**
* This is the implementation of the repository service to drive the GWT based
* front end.
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,244 +0,0 @@
-package org.drools.guvnor.server.builder;
-/*
- * 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.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-
-import org.drools.bpmn2.xml.BPMNSemanticModule;
-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.DSLTokenizedMappingFile;
-import org.drools.lang.dsl.DefaultExpander;
-import org.drools.repository.AssetItem;
-import org.drools.repository.AssetItemIterator;
-import org.drools.repository.PackageItem;
-import org.drools.repository.RulesRepositoryException;
-import org.drools.rule.MapBackedClassLoader;
-import org.drools.util.ChainedProperties;
-
-/**
- * This decorates the drools-compiler PackageBuilder
- * with some functionality needed for the BRMS.
- * This can use the BRMS repo as a classpath.
- *
- * @author Michael Neale
- */
-public class BRMSPackageBuilder extends PackageBuilder {
-
- private List<DSLTokenizedMappingFile> dslFiles;
- private DefaultExpander expander;
-
- /**
- * This will give you a fresh new PackageBuilder
- * using the given classpath.
- * @param classpath The classpath from the package
- * @param buildProps Properties to pass into the package builder configuration.
- */
- public static BRMSPackageBuilder getInstance(List<JarInputStream> classpath, Properties buildProps) {
- MapBackedClassLoader loader = createClassLoader(classpath);
-
-
- // See if we can find a packagebuilder.conf
- // We do this manually here, as we cannot rely on PackageBuilder doing this correctly
- // note this chainedProperties already checks System properties too
- ChainedProperties chainedProperties = new ChainedProperties( "packagebuilder.conf",
- BRMSPackageBuilder.class.getClassLoader(), // pass this as it searches currentThread anyway
- false ); // false means it ignores any default values
-
- // the default compiler. This is nominally JANINO but can be overridden by setting drools.dialect.java.compiler to ECLIPSE
- Properties properties = new Properties();
- properties.setProperty( "drools.dialect.java.compiler",
- chainedProperties.getProperty( "drools.dialect.java.compiler", "ECLIPSE" ) );
- properties.putAll(buildProps);
- PackageBuilderConfiguration pkgConf = new PackageBuilderConfiguration( properties );
-
- pkgConf.setAllowMultipleNamespaces(false);
- pkgConf.setClassLoader( loader );
- pkgConf.addSemanticModule(new BPMNSemanticModule());
-
- return new BRMSPackageBuilder( pkgConf );
-
- }
-
- /**
- * For a given list of Jars, create a class loader.
- */
- public static MapBackedClassLoader createClassLoader(
- List<JarInputStream> classpath) {
- ClassLoader parentClassLoader = Thread.currentThread().getContextClassLoader();
- if ( parentClassLoader == null ) {
- parentClassLoader = BRMSPackageBuilder.class.getClassLoader();
- }
-
-
-
- final ClassLoader p = parentClassLoader;
-
- MapBackedClassLoader loader = AccessController.doPrivileged( new PrivilegedAction<MapBackedClassLoader>() {
- public MapBackedClassLoader run() {
- return new MapBackedClassLoader( p );
- }
- });
-
-
- try {
- for ( JarInputStream jis : classpath ) {
- JarEntry entry = null;
- byte[] buf = new byte[1024];
- int len = 0;
- while ( (entry = jis.getNextJarEntry()) != null ) {
- if ( !entry.isDirectory() && !entry.getName().endsWith( ".java" ) ) {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- while ( (len = jis.read( buf )) >= 0 ) {
- out.write( buf, 0, len );
- }
-
- loader.addResource( entry.getName() , out.toByteArray() );
- }
- }
-
- }
- } catch ( IOException e ) {
- throw new RulesRepositoryException( e );
- }
- return loader;
- }
-
-
- /**
- * In the BRMS you should not need to use this, use the getInstance factory method instead.
- * @param config
- */
- private BRMSPackageBuilder(
- PackageBuilderConfiguration config) {
- super( config );
- }
-
- public BRMSPackageBuilder() {
- super(new PackageBuilderConfiguration());
- }
-
- /**
- * This will reset the errors.
- */
- public void clearErrors() {
- super.resetErrors();
- }
-
- public void setDSLFiles(List<DSLTokenizedMappingFile> files) {
- this.dslFiles = files;
- }
-
- public List<DSLTokenizedMappingFile> getDSLMappingFiles() {
- return Collections.unmodifiableList( this.dslFiles );
- }
-
- /**
- * Load up all the DSL mappping files for the given package.
- */
- public static List<DSLTokenizedMappingFile> getDSLMappingFiles(PackageItem pkg, DSLErrorEvent err) {
- List<DSLTokenizedMappingFile> result = new ArrayList<DSLTokenizedMappingFile>();
- AssetItemIterator it = pkg.listAssetsByFormat( new String[]{AssetFormats.DSL} );
- while ( it.hasNext() ) {
- AssetItem item = it.next();
- if (!item.getDisabled()) {
- String dslData = item.getContent();
- DSLTokenizedMappingFile file = new DSLTokenizedMappingFile();
- try {
- if ( file.parseAndLoad( new StringReader( dslData ) ) ) {
- result.add( file );
- } else {
- List errs = file.getErrors();
- for ( Iterator iter = errs.iterator(); iter.hasNext(); ) {
- DSLMappingParseException e = (DSLMappingParseException) iter.next();
- err.recordError( item, "Line " + e.getLine() + " : " + e.getMessage() );
- }
- }
-
- } catch ( IOException e ) {
- throw new RulesRepositoryException(e);
- }
- }
-
- }
-
- return result;
- }
-
- /**
- * Load up all the Jars for the given package.
- */
- public static List<JarInputStream> getJars(PackageItem pkg) {
- List<JarInputStream> result = new ArrayList<JarInputStream>();
- AssetItemIterator ait = pkg.listAssetsByFormat( new String[]{AssetFormats.MODEL} );
- while ( ait.hasNext() ) {
- AssetItem item = (AssetItem) ait.next();
- if ( item.getBinaryContentAttachment() != null ) {
- try {
- result.add( new JarInputStream( item.getBinaryContentAttachment(),
- false ) );
- } catch ( IOException e ) {
- throw new RulesRepositoryException(e);
- }
- }
- }
- return result;
- }
-
- /**
- * This is used when loading Jars, DSLs etc to report errors.
- */
- public static interface DSLErrorEvent {
- public void recordError(AssetItem asset, String message);
- }
-
- /**
- * Returns true if this package uses a DSL.
- */
- public boolean hasDSL() {
- return this.dslFiles != null && this.dslFiles.size() > 0;
- }
-
- /**
- * Returns an expander for DSLs (only if there is a DSL configured for this package).
- */
- public DefaultExpander getDSLExpander() {
- if (this.expander == null) {
- expander = new DefaultExpander();
- for ( DSLMappingFile file : this.dslFiles ) {
- expander.addDSLMapping( file.getMapping() );
- }
- }
- return expander;
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentAssemblyError.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentAssemblyError.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentAssemblyError.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,44 +0,0 @@
-package org.drools.guvnor.server.builder;
-/*
- * 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.repository.VersionableItem;
-
-/**
- * This class is used to accumulate error reports for asset.
- * This can then be used to feed back to the user where the problems are.
- *
- * @author Michael Neale
- */
-public class ContentAssemblyError {
-
- public ContentAssemblyError(VersionableItem it, String message) {
- this.itemInError = it;
- this.errorReport = message;
- }
- /**
- * This may be null, if its not associated to any particular asset.
- */
- public VersionableItem itemInError;
- public String errorReport;
-
- public String toString() {
- return this.errorReport;
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,447 +0,0 @@
-package org.drools.guvnor.server.builder;
-
-/*
- * 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.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-import org.drools.builder.conf.DefaultPackageNameOption;
-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.ICompilable;
-import org.drools.guvnor.server.contenthandler.IRuleAsset;
-import org.drools.guvnor.server.selector.AssetSelector;
-import org.drools.guvnor.server.selector.SelectorManager;
-import org.drools.guvnor.server.selector.BuiltInSelector;
-import org.drools.guvnor.server.util.LoggingHelper;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.repository.AssetItem;
-import org.drools.repository.AssetItemIterator;
-import org.drools.repository.PackageItem;
-import org.drools.repository.RulesRepositoryException;
-import org.drools.repository.VersionableItem;
-import org.drools.rule.Package;
-
-/**
- * This assembles packages in the BRMS into binary package objects, and deals
- * with errors etc. Each content type is responsible for contributing to the
- * package.
- *
- * @author Michael Neale
- */
-public class ContentPackageAssembler {
- private static final Logger log = LoggingHelper.getLogger( ContentPackageAssembler.class );
-
- private PackageItem pkg;
-
- /**
- * We accumulate errors here. If they come from the builder, then we reset
- * the builders errors so as to not double report. It also means we can
- * track errors to the exact asset that caused it.
- */
- private List<ContentAssemblyError> errors = new ArrayList<ContentAssemblyError>();
-
- BRMSPackageBuilder builder;
-
- private String customSelectorName;
- private String buildMode;
- private String statusOperator;
- private String statusDescriptionValue;
- private boolean enableStatusSelector;
- private String categoryOperator;
- private String categoryValue;
- private boolean enableCategorySelector;
-
- /**
- * Use this if you want to build the whole package.
- *
- * @param pkg
- * The package.
- */
- public ContentPackageAssembler(PackageItem pkg) {
- this(pkg, true);
- }
-
- /**
- * @param pkg
- * The package.
- * @param compile
- * true if we want to build it. False and its just for looking at
- * source.
- */
- public ContentPackageAssembler(PackageItem pkg, boolean compile) {
- this(pkg, compile, null, null, null, false, null, null, false, null);
- }
-
- /**
- * @param assetPackage
- * The package.
- * @param compile
- * true if we want to build it. False and its just for looking at
- * source.
- * @param selectorConfigName
- */
- public ContentPackageAssembler(PackageItem assetPackage, boolean compile, String buildMode,
- String statusOperator, String statusDescriptionValue, boolean enableStatusSelector,
- String categoryOperator, String categoryValue, boolean enableCategorySelector,
- String selectorConfigName) {
-
- this.pkg = assetPackage;
- this.customSelectorName = selectorConfigName;
- this.buildMode = buildMode;
- this.statusOperator = statusOperator;
- this.statusDescriptionValue = statusDescriptionValue;
- this.enableStatusSelector = enableStatusSelector;
- this.categoryOperator = categoryOperator;
- this.categoryValue = categoryValue;
- this.enableCategorySelector = enableCategorySelector;
-
- createBuilder();
-
- if (compile && preparePackage()) {
- buildPackage();
- }
- }
-
- /**
- * Use this if you want to build and compile just the one asset.
- */
- public ContentPackageAssembler(AssetItem assetToBuild) {
- this.pkg = assetToBuild.getPackage();
- createBuilder();
-
- if (preparePackage()) {
- buildAsset(assetToBuild);
- }
- }
-
- public void createBuilder() {
- try {
- Properties ps = loadConfProperties(pkg);
- ps.setProperty( DefaultPackageNameOption.PROPERTY_NAME, this.pkg.getName() );
- builder = BRMSPackageBuilder.getInstance(BRMSPackageBuilder.getJars(pkg), ps);
- } catch (IOException e) {
- throw new RulesRepositoryException("Unable to load configuration properties for package.", e);
- }
- }
-
-
- /**
- * Load all the .properties and .conf files into one big happy Properties instance.
- */
- Properties loadConfProperties(PackageItem pkg) throws IOException {
- Properties ps = new Properties();
- AssetItemIterator iter = pkg.listAssetsByFormat(new String[] {"properties", "conf"});
- while(iter.hasNext()) {
- AssetItem conf = iter.next();
- conf.getContent();
- Properties p = new Properties();
- p.load(conf.getBinaryContentAttachment());
- ps.putAll(p);
- }
- return ps;
- }
-
- /**
- * This will build the package - preparePackage would have been called first.
- * This will always prioritise DRL before other assets.
- */
- private void buildPackage() {
- AssetSelector selector = null;
- if("customSelector".equals(buildMode)) {
- selector = SelectorManager.getInstance().getSelector(customSelectorName);
- } else if ("builtInSelector".equals(buildMode)) {
- selector = (BuiltInSelector)SelectorManager.getInstance().getSelector(
- "BuiltInSelector");
- ((BuiltInSelector)selector).setStatusOperator(statusOperator);
- ((BuiltInSelector)selector).setStatus(statusDescriptionValue);
- ((BuiltInSelector)selector).setEnableStatusSelector(enableStatusSelector);
- ((BuiltInSelector)selector).setCategory(categoryValue);
- ((BuiltInSelector)selector).setCategoryOperator(categoryOperator);
- ((BuiltInSelector)selector).setEnableCategorySelector(enableCategorySelector);
- } else {
- //return the NilSelector, i.e., allows everything
- selector = SelectorManager.getInstance().getSelector(null);
- }
-
- if (selector == null) {
- this.errors.add(new ContentAssemblyError(this.pkg,
- "The selector named " + customSelectorName
- + " is not available."));
- return;
- }
-
- StringBuffer includedAssets = new StringBuffer("Following assets have been included in package build: ");
- Iterator<AssetItem> drls = pkg.listAssetsByFormat(new String[]{AssetFormats.DRL});
- while (drls.hasNext()) {
- AssetItem asset = (AssetItem) drls.next();
- if (!asset.isArchived() && (selector.isAssetAllowed(asset))) {
- buildAsset(asset);
- includedAssets.append(asset.getName() + ", ");
- }
- }
- Iterator<AssetItem> it = pkg.getAssets();
- while (it.hasNext()) {
- AssetItem asset = (AssetItem) it.next();
- if (!asset.getFormat().equals(AssetFormats.DRL) && !asset.isArchived() && (selector.isAssetAllowed(asset))) {
- buildAsset(asset);
- includedAssets.append(asset.getName() + ", ");
- }
- }
- log.info(includedAssets.toString());
- }
-
- /**
- * Builds assets that are "rule" assets (ie things that are not functions
- * etc).
- */
- private void buildAsset(AssetItem asset) {
- ContentHandler h = ContentManager.getHandler(asset.getFormat());
- if (h instanceof ICompilable && !asset.getDisabled()) {
- try {
- ((ICompilable) h).compile(builder, asset, new ErrorLogger());
- if (builder.hasErrors()) {
- this.recordBuilderErrors(asset);
- // clear the errors, so we don't double report.
- builder.clearErrors();
- }
- } catch (DroolsParserException e) {
- throw new RulesRepositoryException(e);
- } catch (IOException e) {
- throw new RulesRepositoryException(e);
- }
- }
- }
-
- /**
- * This prepares the package builder, loads the jars/classpath.
- *
- * @return true if everything is good to go, false if its all gone horribly
- * wrong, and we can't even get the package header up.
- */
- private boolean preparePackage() {
-
- // firstly we loadup the classpath
- builder.addPackage(new PackageDescr(pkg.getName()));
-
- loadDeclaredTypes();
- // now we deal with the header (imports, templates, globals).
- addDrl(ServiceImplementation.getDroolsHeader(pkg));
- if (builder.hasErrors()) {
- recordBuilderErrors(pkg);
- // if we have any failures, lets drop out now, no point in going
- // any further
- return false;
- }
-
- loadDSLFiles();
-
- // finally, any functions we will load at this point.
- AssetItemIterator it = this.pkg
- .listAssetsByFormat(new String[] { AssetFormats.FUNCTION });
-
- // Adds the function DRLs as one string because they might be calling each others.
- StringBuilder stringBuilder = new StringBuilder();
- while ( it.hasNext() ) {
- AssetItem func = it.next();
- if ( !func.getDisabled() ) {
- stringBuilder.append( func.getContent() );
- }
- }
- addDrl( stringBuilder.toString() );
- // If the function part had errors we need to add them one by one to find out which one is bad.
- if ( builder.hasErrors() ) {
- builder.clearErrors();
- it = this.pkg.listAssetsByFormat( new String[]{AssetFormats.FUNCTION} );
- while ( it.hasNext() ) {
- AssetItem func = it.next();
- if ( !func.getDisabled() ) {
- addDrl( func.getContent() );
- if ( builder.hasErrors() ) {
- recordBuilderErrors( func );
- builder.clearErrors();
- }
- }
- }
- }
-
- return errors.size() == 0;
- }
-
- private void loadDeclaredTypes() {
- AssetItemIterator it = this.pkg
- .listAssetsByFormat(new String[] { AssetFormats.DRL_MODEL });
- while (it.hasNext()) {
- AssetItem as = it.next();
- if (!as.getDisabled()) {
- try {
- String content = as.getContent();
- if (nonEmpty(content)) {
- builder.addPackageFromDrl(new StringReader(as.getContent()));
- }
- } catch (DroolsParserException e) {
- this.errors.add(new ContentAssemblyError(as,
- "Parser exception: " + e.getMessage()));
- } catch (IOException e) {
- this.errors.add(new ContentAssemblyError(as, "IOException: "
- + e.getMessage()));
- }
- }
- }
-
- }
-
- private boolean nonEmpty(String content) {
- return content != null && content.trim().length() > 0;
- }
-
- private void loadDSLFiles() {
- // now we load up the DSL files
- builder.setDSLFiles(BRMSPackageBuilder.getDSLMappingFiles(pkg,
- new BRMSPackageBuilder.DSLErrorEvent() {
- public void recordError(AssetItem asset, String message) {
- errors.add(new ContentAssemblyError(asset, message));
- }
- }));
- }
-
- /**
- * This will return true if there is an error in the package configuration
- * or functions.
- *
- * @return
- */
- public boolean isPackageConfigurationInError() {
- if (this.errors.size() > 0) {
- return this.errors.get(0).itemInError instanceof PackageItem;
- } else {
- return false;
- }
- }
-
- private void addDrl(String drl) {
- if ( "".equals( drl.trim() ) ) {
- return;
- }
- try {
- builder.addPackageFromDrl(new StringReader(drl));
- } catch (DroolsParserException e) {
- throw new RulesRepositoryException(
- "Unexpected error when parsing package.", e);
- } catch (IOException e) {
- throw new RulesRepositoryException(
- "IO Exception occurred when parsing package.", e);
- }
- }
-
- /**
- * This will accumulate the errors.
- */
- private void recordBuilderErrors(VersionableItem asset) {
- DroolsError[] errs = builder.getErrors().getErrors();
- for (int i = 0; i < errs.length; i++) {
- this.errors.add(new ContentAssemblyError(asset, errs[i]
- .getMessage()));
- }
-
- }
-
- /**
- * I've got a package people !
- */
- public Package getBinaryPackage() {
- if (this.hasErrors()) {
- throw new IllegalStateException(
- "There is no package available, as there were errors.");
- }
- return builder.getPackage();
- }
-
- public boolean hasErrors() {
- return errors.size() > 0;
- }
-
- public List<ContentAssemblyError> getErrors() {
- return this.errors;
- }
-
- public BRMSPackageBuilder getBuilder() {
- return builder;
- }
-
- /**
- * This is passed in to the compilers so extra errors can be added.
- *
- * @author Michael Neale
- */
- public class ErrorLogger {
- public void logError(ContentAssemblyError err) {
- errors.add(err);
- }
- }
-
- public String getDRL() {
- StringBuffer src = new StringBuffer();
- src.append("package " + this.pkg.getName() + "\n");
- src.append(ServiceImplementation.getDroolsHeader(this.pkg) + "\n\n");
-
- // now we load up the DSL files
- builder.setDSLFiles(BRMSPackageBuilder.getDSLMappingFiles(pkg,
- new BRMSPackageBuilder.DSLErrorEvent() {
- public void recordError(AssetItem asset, String message) {
- errors.add(new ContentAssemblyError(asset, message));
- }
- }));
-
- // do the functions and declared types.
- AssetItemIterator it = this.pkg.listAssetsByFormat(new String[] {
- AssetFormats.FUNCTION, AssetFormats.DRL_MODEL });
- while (it.hasNext()) {
- AssetItem func = it.next();
- if (!func.isArchived() && !func.getDisabled()) {
- src.append(func.getContent()).append("\n\n");
- }
- }
-
- // now the rules
- Iterator<AssetItem> iter = pkg.getAssets();
- while (iter.hasNext()) {
- AssetItem asset = (AssetItem) iter.next();
- if (!asset.isArchived() && !asset.getDisabled()) {
-
- ContentHandler handler = ContentManager.getHandler(asset.getFormat());
- if (handler.isRuleAsset()) {
- IRuleAsset ruleAsset = (IRuleAsset) handler;
- ruleAsset.assembleDRL(builder, asset, src);
- }
- src.append("\n\n");
- }
- }
-
- return src.toString();
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,315 +0,0 @@
-package org.drools.guvnor.server.builder;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.drools.definition.process.Connection;
-import org.drools.definition.process.Node;
-import org.drools.guvnor.client.rpc.RuleFlowContentModel;
-import org.drools.guvnor.client.rulefloweditor.ElementContainerTransferNode;
-import org.drools.guvnor.client.rulefloweditor.HumanTaskTransferNode;
-import org.drools.guvnor.client.rulefloweditor.SplitNode;
-import org.drools.guvnor.client.rulefloweditor.SplitTransferNode;
-import org.drools.guvnor.client.rulefloweditor.TransferConnection;
-import org.drools.guvnor.client.rulefloweditor.TransferNode;
-import org.drools.guvnor.client.rulefloweditor.WorkItemTransferNode;
-import org.drools.process.core.Work;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.impl.ConnectionRef;
-import org.drools.workflow.core.node.ActionNode;
-import org.drools.workflow.core.node.CompositeNode;
-import org.drools.workflow.core.node.EndNode;
-import org.drools.workflow.core.node.EventNode;
-import org.drools.workflow.core.node.FaultNode;
-import org.drools.workflow.core.node.ForEachNode;
-import org.drools.workflow.core.node.HumanTaskNode;
-import org.drools.workflow.core.node.Join;
-import org.drools.workflow.core.node.MilestoneNode;
-import org.drools.workflow.core.node.RuleSetNode;
-import org.drools.workflow.core.node.Split;
-import org.drools.workflow.core.node.StartNode;
-import org.drools.workflow.core.node.SubProcessNode;
-import org.drools.workflow.core.node.TimerNode;
-import org.drools.workflow.core.node.WorkItemNode;
-
-public class RuleFlowContentModelBuilder {
-
- public static RuleFlowContentModel createModel(RuleFlowProcess process) {
-
- RuleFlowContentModel model = new RuleFlowContentModel();
-
- Collection<TransferNode> transferNodes = createNodesAndConnections( process.getNodes(),
- model );
-
- model.getNodes().addAll( transferNodes );
-
- return model;
- }
-
- /**
- * Creates transfer nodes from RuleFlowProcess nodes.
- *
- * @param nodes from the rule flow XML.
- * @param model RuleFlowContentModel that contains the transfer nodes for client side.
- */
- private static List<TransferNode> createNodesAndConnections(Node[] nodes,
- RuleFlowContentModel model) {
-
- List<TransferNode> transferNodes = new ArrayList<TransferNode>();
-
- for ( int i = 0; i < nodes.length; i++ ) {
- Node node = nodes[i];
- TransferNode.Type type = getType( node );
- TransferNode tn = null;
-
- if ( type == TransferNode.Type.WORK_ITEM ) {
-
- tn = createWorkItemTransfernode( (WorkItemNode) node );
-
- } else if ( type == TransferNode.Type.HUMANTASK ) {
-
- tn = createHumanTaskTransferNode( (HumanTaskNode) node );
-
- } else if ( type == TransferNode.Type.SPLIT ) {
-
- tn = createSplitNode( (Split) node );
-
- } else if ( type == TransferNode.Type.FOR_EACH ) {
-
- tn = createRuleFlowContentModelTransferNode( ((ForEachNode) node).getNodes() );
-
- } else if ( type == TransferNode.Type.COMPOSITE ) {
-
- tn = createRuleFlowContentModelTransferNode( ((CompositeNode) node).getNodes() );
-
- } else {
-
- tn = new TransferNode();
-
- }
-
- /*
- * Creates connections for from and to this node.
- */
- createConnections( model,
- node );
-
- tn.setId( node.getId() );
-
- //Guard needed to Migrate v4 ruleflows to v5
- Integer x = (Integer) node.getMetaData( "x" );
- if ( x != null ) {
- tn.setX( x );
- }
-
- // Guard needed to Migrate v4 ruleflows to v5
- Integer y = (Integer) node.getMetaData( "y" );
- if ( y != null ) {
- tn.setY( y );
- }
-
- Integer height = (Integer) node.getMetaData( "height" );
- if ( height != null ) {
- tn.setHeight( height );
- }
-
- Integer width = (Integer) node.getMetaData( "width" );
- if ( width != null ) {
- tn.setWidth( width );
- }
-
- tn.setName( node.getName() );
- tn.setType( type );
-
- transferNodes.add( tn );
- }
-
- return transferNodes;
- }
-
- private static ElementContainerTransferNode createRuleFlowContentModelTransferNode(Node[] nodes) {
-
- ElementContainerTransferNode fetn = new ElementContainerTransferNode();
- RuleFlowContentModel model = new RuleFlowContentModel();
-
- List<TransferNode> transferNodes = createNodesAndConnections( nodes,
- model );
-
- model.setNodes( transferNodes );
- fetn.setContentModel( model );
-
- return fetn;
- }
-
- /**
- * Checks this node for out and in going connections and creates a transfer object from them.
- *
- * @param model
- * @param node
- */
- private static void createConnections(RuleFlowContentModel model,
- Node node) {
-
- for ( List<Connection> inConnections : node.getIncomingConnections().values() ) {
- for ( Connection connection : inConnections ) {
- // if ( !"DROOLS_DEFAULT".equals( connection.getFromType() ) && !"DROOLS_DEFAULT".equals( connection.getToType() ) ) {
- createConnection( model,
- connection );
- // }
- }
- }
-
- for ( List<Connection> outConnections : node.getOutgoingConnections().values() ) {
- for ( Connection connection : outConnections ) {
- // if ( !"DROOLS_DEFAULT".equals( connection.getFromType() ) && !"DROOLS_DEFAULT".equals( connection.getToType() ) ) {
- createConnection( model,
- connection );
- // }
- }
- }
- }
-
- /**
- * Creates a single connection to be transferred.
- *
- * @param model
- * @param connection
- */
- private static void createConnection(RuleFlowContentModel model,
- Connection connection) {
- TransferConnection tc = new TransferConnection();
-
- tc.setFromId( connection.getFrom().getId() );
- tc.setToId( connection.getTo().getId() );
-
- model.getConnections().add( tc );
- }
-
- private static TransferNode createHumanTaskTransferNode(HumanTaskNode node) {
- HumanTaskTransferNode httn = new HumanTaskTransferNode();
-
- Work work = node.getWork();
-
- if ( work != null ) {
- for ( String key : work.getParameters().keySet() ) {
-
- Object o = work.getParameters().get( key );
- String value;
-
- if ( o == null ) {
- value = "";
- } else {
- value = o.toString();
- }
-
- httn.getParameters().put( key,
- value );
- }
- }
-
- return httn;
- }
-
- private static SplitTransferNode createSplitNode(Split s) {
- SplitTransferNode sn = new SplitTransferNode();
-
- sn.setSplitType( SplitTransferNode.Type.getType( s.getType() ) );
-
- for ( ConnectionRef connection : s.getConstraints().keySet() ) {
-
- SplitNode.ConnectionRef ref = new SplitNode.ConnectionRef();
- ref.setNodeId( connection.getNodeId() );
- ref.setToType( connection.getToType() );
-
- SplitNode.Constraint constraint = getConstraint( s.getConstraints().get( connection ) );
-
- sn.getConstraints().put( ref,
- constraint );
- }
-
- return sn;
- }
-
- private static WorkItemTransferNode createWorkItemTransfernode(WorkItemNode node) {
- WorkItemTransferNode tn = new WorkItemTransferNode();
-
- Work work = node.getWork();
-
- if ( work != null ) {
- tn.setWorkName( work.getName() );
-
- for ( String key : work.getParameters().keySet() ) {
-
- Object o = work.getParameters().get( key );
- String value;
-
- if ( o == null ) {
- value = "";
- } else {
- value = o.toString();
- }
-
- tn.getParameters().put( key,
- value );
- }
- }
-
- return tn;
- }
-
- private static org.drools.guvnor.client.rulefloweditor.SplitNode.Constraint getConstraint(Constraint constraint) {
-
- SplitNode.Constraint c = new SplitNode.Constraint();
-
- c.setConstraint( constraint.getConstraint() );
-
- c.setDialect( constraint.getDialect() );
-
- c.setName( constraint.getName() );
-
- c.setPriority( constraint.getPriority() );
-
- c.setType( constraint.getType() );
-
- return c;
- }
-
- private static TransferNode.Type getType(Node node) {
- if ( node instanceof StartNode ) {
- return TransferNode.Type.START;
- } else if ( node instanceof EndNode ) {
- return TransferNode.Type.END;
- } else if ( node instanceof ActionNode ) {
- return TransferNode.Type.ACTION_NODE;
- } else if ( node instanceof RuleSetNode ) {
- return TransferNode.Type.RULESET;
- } else if ( node instanceof SubProcessNode ) {
- return TransferNode.Type.SUB_PROCESS;
- } else if ( node instanceof ForEachNode ) {
- return TransferNode.Type.FOR_EACH;
- } else if ( node instanceof CompositeNode ) {
- return TransferNode.Type.COMPOSITE;
- } else if ( node instanceof Join ) {
- return TransferNode.Type.JOIN;
- } else if ( node instanceof Split ) {
- return TransferNode.Type.SPLIT;
- } else if ( node instanceof MilestoneNode ) {
- return TransferNode.Type.MILESTONE;
- } else if ( node instanceof TimerNode ) {
- return TransferNode.Type.TIMER;
- } else if ( node instanceof HumanTaskNode ) {
- return TransferNode.Type.HUMANTASK;
- } else if ( node instanceof WorkItemNode ) {
- return TransferNode.Type.WORK_ITEM;
- } else if ( node instanceof FaultNode ) {
- return TransferNode.Type.FAULT;
- } else if ( node instanceof EventNode ) {
- return TransferNode.Type.EVENT;
- }
-
- throw new IllegalArgumentException( "Unkown node type " + node );
-
- }
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,184 +0,0 @@
-/*
- * 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.server.builder;
-
-import java.util.Collection;
-
-import org.drools.definition.process.Node;
-import org.drools.guvnor.client.rulefloweditor.ElementContainerTransferNode;
-import org.drools.guvnor.client.rulefloweditor.HumanTaskTransferNode;
-import org.drools.guvnor.client.rulefloweditor.SplitNode;
-import org.drools.guvnor.client.rulefloweditor.SplitTransferNode;
-import org.drools.guvnor.client.rulefloweditor.TransferNode;
-import org.drools.guvnor.client.rulefloweditor.WorkItemTransferNode;
-import org.drools.guvnor.client.rulefloweditor.TransferNode.Type;
-import org.drools.process.core.Work;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.impl.ConnectionRef;
-import org.drools.workflow.core.node.CompositeNode;
-import org.drools.workflow.core.node.ForEachNode;
-import org.drools.workflow.core.node.HumanTaskNode;
-import org.drools.workflow.core.node.Split;
-import org.drools.workflow.core.node.WorkItemNode;
-
-public class RuleFlowProcessBuilder {
-
- public static void updateProcess(RuleFlowProcess process,
- Collection<TransferNode> contentNodes) {
-
- for ( TransferNode tn : contentNodes ) {
-
- Node node = process.getNode( tn.getId() );
-
- updateNode( tn,
- node );
- }
- }
-
- // public static void updateContainer(NodeContainer nodeContainer,
- // Collection<TransferNode> contentNodes) {
- //
- // for ( TransferNode tn : contentNodes ) {
- //
- // Node node = nodeContainer.getNode( tn.getId() );
- //
- // updateNode( tn,
- // node );
- // }
- // }
-
- private static void updateNode(TransferNode tn,
- Node node) {
- /*
- * At this point only the parameters are editable
- */
- if ( tn instanceof HumanTaskTransferNode ) {
-
- updateHumanTask( (HumanTaskTransferNode) tn,
- (HumanTaskNode) node );
-
- } else if ( tn instanceof WorkItemTransferNode ) {
-
- updateWorkItem( (WorkItemTransferNode) tn,
- (WorkItemNode) node );
-
- } else if ( tn instanceof SplitTransferNode ) {
-
- updateSplitNode( (SplitTransferNode) tn,
- (Split) node );
-
- } else if ( tn instanceof ElementContainerTransferNode ) {
-
- if ( tn.getType() == Type.FOR_EACH ) {
-
- updateForEach( (ElementContainerTransferNode) tn,
- (ForEachNode) node );
-
- } else if ( tn.getType() == Type.COMPOSITE ) {
-
- updateComposite( (ElementContainerTransferNode) tn,
- (CompositeNode) node );
-
- }
- }
- }
-
- private static void updateHumanTask(HumanTaskTransferNode httn,
- HumanTaskNode humanTaskNode) {
- Work work = humanTaskNode.getWork();
-
- if ( work != null ) {
- for ( String key : work.getParameters().keySet() ) {
-
- work.setParameter( key,
- httn.getParameters().get( key ) );
- }
- }
- }
-
- private static void updateWorkItem(WorkItemTransferNode witn,
- WorkItemNode workItemNode) {
- Work work = workItemNode.getWork();
-
- if ( work != null ) {
-
- for ( String key : work.getParameters().keySet() ) {
-
- work.setParameter( key,
- witn.getParameters().get( key ) );
- }
- }
- }
-
- private static void updateSplitNode(SplitTransferNode stn,
- Split splitNode) {
- for ( ConnectionRef connection : splitNode.getConstraints().keySet() ) {
-
- final ConnectionRef ref1 = new ConnectionRef( connection.getNodeId(),
- connection.getToType() );
-
- SplitNode.ConnectionRef ref2 = new SplitNode.ConnectionRef();
- ref2.setNodeId( connection.getNodeId() );
- ref2.setToType( connection.getToType() );
-
- Constraint c1 = splitNode.internalGetConstraint( ref1 );
- SplitNode.Constraint c2 = stn.getConstraints().get( ref2 );
-
- updateConstraint( c1,
- c2 );
- }
- }
-
- private static void updateForEach(ElementContainerTransferNode tn,
- ForEachNode foreachNode) {
-
- for ( TransferNode subTn : tn.getContentModel().getNodes() ) {
-
- Node subNode = foreachNode.getNode( subTn.getId() );
-
- updateNode( subTn,
- subNode );
- }
- }
-
- private static void updateComposite(ElementContainerTransferNode tn,
- CompositeNode compositeNode) {
-
- for ( TransferNode subTn : tn.getContentModel().getNodes() ) {
-
- Node subNode = compositeNode.getNode( subTn.getId() );
-
- updateNode( subTn,
- subNode );
- }
- }
-
- private static void updateConstraint(Constraint to,
- org.drools.guvnor.client.rulefloweditor.SplitNode.Constraint from) {
-
- to.setConstraint( from.getConstraint() );
-
- to.setDialect( from.getDialect() );
-
- to.setName( from.getName() );
-
- to.setPriority( from.getPriority() );
-
- to.setType( from.getType() );
- }
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPELHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPELHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPELHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,49 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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 org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-public class BPELHandler extends ContentHandler {
-
- public void retrieveAssetContent(RuleAsset asset, PackageItem pkg,
- AssetItem item) throws SerializableException {
-
- // Get the name
-
- InputStream in = item.getBinaryContentAttachment();
-
- if (in != null) {
- RuleContentText text = new RuleContentText();
- text.content = asset.metaData.name;
- asset.content = text;
- }
-
- }
-
- public void storeAssetContent(RuleAsset asset, AssetItem repoAsset)
- throws SerializableException {
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,116 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.drools.bpmn2.xml.BPMN2SemanticModule;
-import org.drools.bpmn2.xml.XmlBPMNProcessDumper;
-import org.drools.compiler.DroolsParserException;
-import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleFlowContentModel;
-import org.drools.guvnor.server.builder.BRMSPackageBuilder;
-import org.drools.guvnor.server.builder.RuleFlowContentModelBuilder;
-import org.drools.guvnor.server.builder.ContentPackageAssembler.ErrorLogger;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.compiler.xml.XmlProcessReader;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-public class BPMN2ProcessHandler extends ContentHandler
- implements
- ICompilable {
-
- public void retrieveAssetContent(RuleAsset asset,
- PackageItem pkg,
- AssetItem item) throws SerializableException {
- RuleFlowProcess process = readProcess( new ByteArrayInputStream( item.getContent().getBytes() ) );
- if ( process != null ) {
- RuleFlowContentModel content = RuleFlowContentModelBuilder.createModel( process );
- content.setXml( item.getContent() );
- asset.content = content;
- }
- }
-
- protected RuleFlowProcess readProcess(InputStream is) {
- RuleFlowProcess process = null;
- try {
- InputStreamReader reader = new InputStreamReader( is );
- PackageBuilderConfiguration configuration = new PackageBuilderConfiguration();
- configuration.initSemanticModules();
- configuration.addSemanticModule( new BPMN2SemanticModule() );
- XmlProcessReader xmlReader = new XmlProcessReader( configuration.getSemanticModules() );
- try {
- process = (RuleFlowProcess) xmlReader.read( reader );
- } catch ( Exception e ) {
- reader.close();
- throw new Exception( "Unable to read BPMN2 XML.",
- e );
- }
- reader.close();
- } catch ( Exception e ) {
- return null;
- }
-
- return process;
- }
-
- public void storeAssetContent(RuleAsset asset,
- AssetItem repoAsset) throws SerializableException {
- }
-
- /**
- * The rule flow can not be built if the package name is not the same as the
- * package that it exists in. This changes the package name.
- *
- * @param item
- */
- public void ruleFlowAttached(AssetItem item) {
- String content = item.getContent();
-
- if ( content != null && !content.equals( "" ) ) {
- RuleFlowProcess process = readProcess( new ByteArrayInputStream( content.getBytes() ) );
- if ( process != null ) {
- String packageName = item.getPackageName();
- String originalPackageName = process.getPackageName();
- if ( !packageName.equals( originalPackageName ) ) {
- process.setPackageName( packageName );
- XmlBPMNProcessDumper dumper = XmlBPMNProcessDumper.INSTANCE;
- String out = dumper.dump( process );
- item.updateContent( out );
- item.checkin( "Changed BPMN2 process package from " + originalPackageName + " to " + packageName );
- }
- }
- }
- }
-
- public void compile(BRMSPackageBuilder builder,
- AssetItem asset,
- ErrorLogger logger) throws DroolsParserException,
- IOException {
- InputStream ins = asset.getBinaryContentAttachment();
- if ( ins != null ) {
- builder.addProcessFromXml( new InputStreamReader( asset.getBinaryContentAttachment() ) );
- }
- }
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,101 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.IOException;
-import java.io.StringReader;
-
-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;
-import org.drools.ide.common.client.modeldriven.brl.RuleModel;
-import org.drools.ide.common.server.util.BRDRLPersistence;
-import org.drools.ide.common.server.util.BRLPersistence;
-import org.drools.ide.common.server.util.BRXMLPersistence;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-public class BRLContentHandler extends ContentHandler
- implements IRuleAsset {
-
-
- public void retrieveAssetContent(RuleAsset asset,
- PackageItem pkg,
- AssetItem item) throws SerializableException {
- asset.content = getBrlXmlPersistence().unmarshal( item.getContent() );
- }
-
- public void storeAssetContent(RuleAsset asset,
- AssetItem repoAsset) throws SerializableException {
- RuleModel data = (RuleModel) asset.content;
- if ( data.name == null ) {
- data.name = repoAsset.getName();
- }
- repoAsset.updateContent( getBrlXmlPersistence().marshal( data ) );
- }
-
- public void compile(BRMSPackageBuilder builder,
- AssetItem asset,
- ContentPackageAssembler.ErrorLogger logger) throws DroolsParserException,
- IOException {
- builder.addPackageFromDrl( new StringReader( getSourceDRL( asset,
- builder ) ) );
- }
-
- public void assembleDRL(BRMSPackageBuilder builder,
- AssetItem asset,
- StringBuffer buf) {
- String drl = getSourceDRL( asset,
- builder );
- buf.append( drl );
- }
-
- private String getSourceDRL(AssetItem asset,
- BRMSPackageBuilder builder) {
- RuleModel model = buildModelFromAsset(asset);
-
- String drl = getBrlDrlPersistence().marshal( model );
- if ( builder.hasDSL() && model.hasDSLSentences() ) {
- drl = builder.getDSLExpander().expand( drl );
- }
- return drl;
- }
-
- protected RuleModel buildModelFromAsset(AssetItem asset) {
- RuleModel model = getBrlXmlPersistence().unmarshal(asset.getContent());
- model.name = asset.getName();
- model.parentName = this.parentNameFromCategory(asset, model.parentName);
- return model;
- }
-
- public String getRawDRL(AssetItem asset) {
- RuleModel model = getBrlXmlPersistence().unmarshal( asset.getContent() );
-
- return getBrlDrlPersistence().marshal( model );
- }
-
- protected BRLPersistence getBrlDrlPersistence() {
- return BRDRLPersistence.getInstance();
- }
-
- protected BRLPersistence getBrlXmlPersistence() {
- return BRXMLPersistence.getInstance();
- }
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BaseXStreamContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BaseXStreamContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BaseXStreamContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,46 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.WorkingSetConfigData;
-import org.drools.ide.common.client.modeldriven.brl.PortableObject;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-import org.drools.repository.RulesRepositoryException;
-import org.slf4j.Logger;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-
-public abstract class BaseXStreamContentHandler<T extends PortableObject> extends ContentHandler {
- protected final Logger log = org.slf4j.LoggerFactory.getLogger(getClass());
-
- private static final XStream xt = new XStream(new DomDriver());
-
- protected XStream getXStream() {
- return xt;
- }
-
- @SuppressWarnings("unchecked")
- public void retrieveAssetContent(RuleAsset asset, PackageItem pkg, AssetItem item) throws SerializableException {
- if (item.getContent() != null && item.getContent().length() > 0) {
- try {
- asset.content = (T) getXStream().fromXML(item.getContent());
- } catch (RulesRepositoryException e) {
- log.error("error marshalling asset content: " + asset.metaData.name, e);
- throw new SerializableException(e.getMessage());
- }
- } else {
- asset.content = new WorkingSetConfigData();
- }
- }
-
- public void storeAssetContent(RuleAsset asset, AssetItem repoAsset) throws SerializableException {
- try {
- repoAsset.updateContent(getXStream().toXML(asset.content));
- } catch (Exception e) {
- log.error("error marshalling asset content: " + asset.metaData.name, e);
- throw new SerializableException(e.getMessage());
- }
- }
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,166 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.repository.AssetItem;
-import org.drools.repository.CategoryItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-/**
- * All content handlers must implement this, and be registered in content_types.properties
- * @author Michael Neale
- *
- */
-public abstract class ContentHandler {
-
- /**
- * When loading asset content.
- * @param asset The target.
- * @param item The source.
- * @throws SerializableException
- */
- public abstract void retrieveAssetContent(RuleAsset asset,
- PackageItem pkg,
- AssetItem item) throws SerializableException;
-
- /**
- * For storing the asset content back into the repo node (any changes).
- * @param asset
- * @param repoAsset
- * @throws SerializableException
- */
- public abstract void storeAssetContent(RuleAsset asset,
- AssetItem repoAsset) throws SerializableException;
-
- /**
- * @return true if the current content type is for a rule asset.
- * If it is a rule asset, then it can be assembled into a package.
- * If its not, then it is there, nominally to support compiling or
- * validation/testing of the package (eg a model, or a dsl file).
- */
- public boolean isRuleAsset() {
- return this instanceof IRuleAsset;
- }
-
- private String findParentCategory(AssetItem asset,
- String currentCat) {
- //Start your search at the top
- CategoryItem item = asset.getRulesRepository().loadCategory( "/" );
- return findCategoryInChild( item,
- currentCat );
- }
-
- private String findCategoryInChild(CategoryItem item,
- String currentCat) {
- List children = item.getChildTags();
- for ( int i = 0; i < children.size(); i++ ) {
- if ( ((CategoryItem) children.get( i )).getName().equals( currentCat ) ) {
- return item.getName();
- } else {
- String check = findCategoryInChild( (CategoryItem) children.get( i ),
- currentCat );
- if ( check != null && check.length() > 0 ) {
- return check;
- }
- }
-
- }
- return "";
- }
-
- private String findKeyforValue(HashMap<String, String> catRules,
- String catToFind) {
- for ( Iterator i = catRules.entrySet().iterator(); i.hasNext(); ) {
- Map.Entry entry = (Map.Entry) i.next();
- //Found rule name that should be used to extend current rule as defined in the Category Rule
- if ( entry.getValue().equals( catToFind ) ) {
- return (String) entry.getKey();
- }
- }
- return "";
- }
-
- /**
- * Search Categories in a package against the current rule to see if the current rule should be extended,
- * via another rule. IE rule rule1 extends rule2
- * This is an implementation of that DRL feature, via Category to Rule mappings in Guvnor
- * @param asset
- * @return rule that should be extended, based on categories
- */
- protected String parentNameFromCategory(AssetItem asset,
- String currentParent) {
-
- List<CategoryItem> cats = asset.getCategories();
- String catName = null;
- String parentCat = null;
- if ( cats.size() > 0 ) {
- // for(int i=0;i< cats.size(); i++){
- // System.out.println(i+" Cat: "+((CategoryItem)(cats.get(i))).getName());
- // System.out.println(i+" Path: "+((CategoryItem)(cats.get(i))).getFullPath());
- //
- // }
- catName = cats.get( 0 ).getName();
- }
- //get all Category Rules for Package
- HashMap<String, String> catRules = asset.getPackage().getCategoryRules();
-
- String newParent = currentParent;
- if ( null != catRules && null != catName ) {
- //Asset or Rule is actually used in the Category Rule, so ignore the category of the normal rule
- //Either extend from the parent category rule or none at all
- String ruleName = asset.getName();
- if ( catRules.containsKey( ruleName ) ) {
- //find Cat for your rule
- parentCat = findParentCategory( asset,
- catRules.get( ruleName ) );
- // System.out.println("Found rule: " + ruleName + " in categoryRuleHash, Parent Cat: " + parentCat);
- //This rule name is in our Category Rules
- //See if there is a Parent and it has a rule defined, if so extend that rule, to create a chain
- if ( parentCat != null && parentCat.length() > 0 && catRules.containsValue( parentCat ) ) {
- // System.out.println("Should have rule in Category to use for my Parent");
- newParent = findKeyforValue( catRules,
- parentCat );
-
- } else {
- //Must be blank to avoid circular reference
- newParent = "";
- }
- //else make sure parent is ALWAYS blank, to avoid circle references
-
- //If the rule is not defined in the Category Rule, check to make sure currentParent isnt already set
- //If you wanted to override the Category Rule, with a extends on the rule manually, honor it
- } else if ( currentParent != null && currentParent.length() > 0 ) {
- newParent = currentParent;
- //Normal use case
- //Category of the current asset has been defined in Category Rules for the current package
- } else if ( catRules.containsValue( catName ) ) {
- newParent = findKeyforValue( catRules,
- catName );
- }
- }
- return newParent;
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,108 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * Copyright 2005 Barry Knapp
- *
- * 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.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-
-/**
- * This configures the content handlers based on a props file.
- * @author Barry Knapp
- */
-public class ContentManager {
-
- private static final Logger log = Logger.getLogger( ContentManager.class );
- public static String CONTENT_CONFIG_PROPERTIES = "/contenthandler.properties";
- private static ContentManager INSTANCE;
-
- /**
- * This is a map of the contentHandlers to use.
- */
- private final Map<String, ContentHandler> contentHandlers = new HashMap<String, ContentHandler>();
-
-
-
- ContentManager(String configPath) {
- log.debug("Loading content properties");
- Properties props = new Properties();
- try {
- props.load(this.getClass().getResourceAsStream(configPath));
- for (Iterator iter = props.keySet().iterator(); iter.hasNext();) {
- String contentHandler = (String) iter.next();
- String val = props.getProperty(contentHandler);
-
- contentHandlers.put(contentHandler, loadContentHandlerImplementation( val ));
-
- }
- } catch (IOException e) {
- log.fatal("UNABLE to load content handlers. Ahem, nothing will actually work. Ignore subsequent errors until this is resolved.", e);
- }
- }
-
- /**
- * Return the content handlers.
- */
- public Map<String, ContentHandler> getContentHandlers() {
-
- return contentHandlers;
- }
-
-
- private ContentHandler loadContentHandlerImplementation(String val) throws IOException {
-
- try {
- return (ContentHandler) Thread.currentThread().getContextClassLoader().loadClass( val ).newInstance();
-
- } catch ( InstantiationException e ) {
- log.error( e );
- return null;
- } catch ( IllegalAccessException e ) {
- log.error( e );
- return null;
- } catch ( ClassNotFoundException e ) {
- log.error( e );
- return null;
- }
-
- }
-
-
- public static ContentManager getInstance() {
- if (INSTANCE == null) {
- //have to do this annoying thing, as in some cases, letting the classloader
- //load it up means that it will fail as the classes aren't yet available.
- //so have to use this nasty anti-pattern here. Sorry.
- synchronized (ContentManager.class) {
- ContentManager.INSTANCE = new ContentManager(CONTENT_CONFIG_PROPERTIES);
- }
- }
- return INSTANCE;
- }
-
-
-
- public static ContentHandler getHandler(String format) {
- ContentHandler h = ContentManager.getInstance().getContentHandlers().get( format );
- if (h == null) h = new DefaultContentHandler();//throw new IllegalArgumentException("Unable to handle the content type: " + format);
- return h;
- }
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,119 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.IOException;
-import java.io.StringReader;
-import java.util.StringTokenizer;
-
-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 {
-
- public void compile(BRMSPackageBuilder builder,
- AssetItem asset,
- ContentPackageAssembler.ErrorLogger logger) throws DroolsParserException,
- IOException {
- String content = getRawDRL( asset );
- if ( content != null && !content.trim().equals( "" ) ) {
- builder.addPackageFromDrl( new StringReader( content ) );
- }
- }
-
- String wrapRuleDeclaration(String name,
- String parentName,
- String content) {
- if ( parentName == null || "".equals( parentName ) ) {
- return "rule '" + name + "'\n" + getContent( content ) + "\nend";
- } else {
- return "rule '" + name + "' extends " + parentName + "\n" + getContent( content ) + "\nend";
- }
- }
-
- String getContent(String content) {
- if ( content != null && content.indexOf( "dialect" ) == -1 ) {
- return "dialect 'mvel'\n" + content;
- }
- return content;
- }
-
- /**
- * This will try and sniff ouf if its a stand alone rule which
- * will use the asset name as the rule name, or if it should be treated as a package
- * (in the latter case, the content is passed as it to the compiler).
- */
- public static boolean isStandAloneRule(String content) {
- if ( content == null || "".equals( content.trim() ) ) {
- return false;
- }
- StringTokenizer st = new StringTokenizer( content,
- "\n\r" );
- while ( st.hasMoreTokens() ) {
- String tok = st.nextToken().trim();
- if ( tok.startsWith( "when" ) ) {
- //well obviously it is stand alone...
- return true;
- }
- //otherwise sniff for a suitable keyword at the start of a line
- if ( startsWithWord( "package",
- tok ) || startsWithWord( "rule",
- tok ) || startsWithWord( "end",
- tok ) || startsWithWord( "function",
- tok ) || startsWithWord( "query",
- tok ) ) {
- return false;
- }
- }
- return true;
-
- }
-
- static boolean startsWithWord(String word,
- String sentence) {
- String[] words = sentence.trim().split( "\\s" );
- if ( words.length > 0 ) {
- return words[0].equals( word );
- } else {
- return false;
- }
- }
-
- public void assembleDRL(BRMSPackageBuilder builder,
- AssetItem asset,
- StringBuffer buf) {
- String content = getRawDRL( asset );
- buf.append( content );
- }
-
- public String getRawDRL(AssetItem asset) {
- String content = asset.getContent();
- if ( isStandAloneRule( content ) ) {
-
- String parentName = this.parentNameFromCategory( asset,
- "" );
- content = wrapRuleDeclaration( asset.getName(),
- parentName,
- content );
- }
- return content;
- }
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLDefinitionContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLDefinitionContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLDefinitionContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,22 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-/*
- * 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.
- */
-
-
-
-public class DSLDefinitionContentHandler extends PlainTextContentHandler {
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,139 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.IOException;
-import java.io.StringReader;
-import java.util.Iterator;
-import java.util.List;
-
-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.DefaultExpander;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-public class DSLRuleContentHandler extends ContentHandler
- implements
- IRuleAsset {
-
- public void retrieveAssetContent(RuleAsset asset,
- PackageItem pkg,
- AssetItem item) throws SerializableException {
- RuleContentText text = new RuleContentText();
- text.content = item.getContent();
-
- asset.content = text;
-
- }
-
- public void storeAssetContent(RuleAsset asset,
- AssetItem repoAsset) throws SerializableException {
-
- RuleContentText text = (RuleContentText) asset.content;
- repoAsset.updateContent( text.content );
-
- }
-
- public void compile(BRMSPackageBuilder builder,
- AssetItem asset,
- ContentPackageAssembler.ErrorLogger logger) throws DroolsParserException,
- IOException {
- DefaultExpander expander = getExpander( builder,
- asset,
- logger );
-
- //add the rule keyword if its 'stand alone'
- String source = asset.getContent();
- if ( DRLFileContentHandler.isStandAloneRule( source ) ) {
- String parentName = this.parentNameFromCategory( asset,
- "" );
- source = wrapRule( asset,
- parentName,
- source );
- }
-
- //expand and check for errors
- String drl = expander.expand( source );
- if ( expander.hasErrors() ) {
- List exErrs = expander.getErrors();
- for ( Iterator iter = exErrs.iterator(); iter.hasNext(); ) {
- ExpanderException ex = (ExpanderException) iter.next();
- logger.logError( new ContentAssemblyError( asset,
- ex.getMessage() ) );
- }
- return;
- }
-
- builder.addPackageFromDrl( new StringReader( drl ) );
- }
-
- private DefaultExpander getExpander(BRMSPackageBuilder builder,
- AssetItem asset,
- ContentPackageAssembler.ErrorLogger logger) {
-
- if ( !builder.hasDSL() ) {
- logger.logError( new ContentAssemblyError( asset,
- "This rule asset requires a DSL, yet none were configured in the package." ) );
- }
-
- return builder.getDSLExpander();
- }
-
- public void assembleDRL(BRMSPackageBuilder builder,
- AssetItem asset,
- StringBuffer buf) {
- //add the rule keyword if its 'stand alone'
- String source = getRawDRL( asset );
-
- DefaultExpander expander = builder.getDSLExpander();
- buf.append( expander.expand( source ) );
-
- }
-
- private String wrapRule(AssetItem asset,
- String parentName,
- String source) {
- if ( parentName == null || "".equals( parentName ) ) {
- return "rule '" + asset.getName() + "' \n" + source + "\nend";
- } else {
- return "rule '" + asset.getName() + "' extends " + parentName + " \n" + source + "\nend";
-
- }
- }
-
- public String getRawDRL(AssetItem asset) {
- String source = asset.getContent();
- if ( DRLFileContentHandler.isStandAloneRule( source ) ) {
- String parentName = this.parentNameFromCategory( asset,
- "" );
- source = wrapRule( asset,
- parentName,
- source );
- }
-
- return source;
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DecisionTableXLSHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DecisionTableXLSHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DecisionTableXLSHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,80 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.IOException;
-import java.io.StringReader;
-
-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;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-/**
- * This is for handling XLS content (classic decision tables).
- *
- * @author Michael Neale
- */
-public class DecisionTableXLSHandler extends ContentHandler
- implements
- IRuleAsset {
-
- public void retrieveAssetContent(RuleAsset asset,
- PackageItem pkg,
- AssetItem item) throws SerializableException {
- //do nothing, as we have an attachment
- }
-
- public void storeAssetContent(RuleAsset asset,
- AssetItem repoAsset) throws SerializableException {
- //do nothing, as we have an attachment
- }
-
- public void assembleDRL(BRMSPackageBuilder builder,
- AssetItem asset,
- StringBuffer buf) {
- buf.append( getRawDRL( asset ) );
- }
-
- public void compile(BRMSPackageBuilder builder,
- AssetItem asset,
- ErrorLogger logger) throws DroolsParserException,
- IOException {
- StringBuffer buf = new StringBuffer();
-
- assembleDRL( builder,
- asset,
- buf );
- builder.addPackageFromDrl( new StringReader( buf.toString() ) );
-
- }
-
- public String getRawDRL(AssetItem asset) {
- SpreadsheetCompiler comp = new SpreadsheetCompiler();
- String drl = comp.compile( false,
- asset.getBinaryContentAttachment(),
- InputType.XLS );
- return drl;
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DefaultContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DefaultContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DefaultContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,24 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-/**
- * Default ones will store things as an attachment.
- */
-public class DefaultContentHandler extends ContentHandler {
-
- @Override
- public void retrieveAssetContent(RuleAsset asset, PackageItem pkg,
- AssetItem item) throws SerializableException {
- }
-
- @Override
- public void storeAssetContent(RuleAsset asset, AssetItem repoAsset)
- throws SerializableException {
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/EnumerationContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/EnumerationContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/EnumerationContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,61 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * Copyright 2007 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.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.drools.guvnor.client.rpc.BuilderResult;
-import org.drools.guvnor.client.rpc.BuilderResultLine;
-import org.drools.ide.common.server.util.DataEnumLoader;
-import org.drools.repository.AssetItem;
-
-
-
-public class EnumerationContentHandler extends PlainTextContentHandler implements IValidating {
-
- public BuilderResult validateAsset(AssetItem asset) {
-
- String content = asset.getContent();
- DataEnumLoader loader = new DataEnumLoader(content);
- if (!loader.hasErrors()) {
- return new BuilderResult();
- } else {
- List<BuilderResultLine> errors = new ArrayList<BuilderResultLine>();
- List errs = loader.getErrors();
-
-
- for ( Iterator iter = errs.iterator(); iter.hasNext(); ) {
-
- BuilderResultLine result = new BuilderResultLine();
- result.assetName = asset.getName();
- result.assetFormat = asset.getFormat();
- result.uuid = asset.getUUID();
- result.message = (String) iter.next();
- errors.add( result );
- }
-
-
- BuilderResult result = new BuilderResult();
- result.lines = errors.toArray( new BuilderResultLine[errors.size()] );
-
- return result;
- }
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,118 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.drools.compiler.DrlParser;
-import org.drools.compiler.DroolsParserException;
-import org.drools.guvnor.client.factmodel.FactMetaModel;
-import org.drools.guvnor.client.factmodel.FactModels;
-import org.drools.guvnor.client.factmodel.FieldMetaModel;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.lang.descr.TypeDeclarationDescr;
-import org.drools.lang.descr.TypeFieldDescr;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-public class FactModelContentHandler extends ContentHandler {
-
- @Override
- public void retrieveAssetContent(RuleAsset asset, PackageItem pkg,
- AssetItem item) throws SerializableException {
- try {
- List<FactMetaModel> models = toModel(item.getContent());
- FactModels ms = new FactModels();
- ms.models = models;
- asset.content = ms;
- } catch (DroolsParserException e) {
- System.err.println("Unable to parse the DRL for the model - falling back to text (" + e.getMessage() + ")");
- RuleContentText text = new RuleContentText();
- text.content = item.getContent();
- asset.content = text;
- }
-
- }
-
- @Override
- public void storeAssetContent(RuleAsset asset, AssetItem repoAsset)
- throws SerializableException {
- if (asset.content instanceof FactModels) {
- FactModels fm = (FactModels) asset.content;
- repoAsset.updateContent(toDRL(fm.models));
- } else {
- RuleContentText text = (RuleContentText) asset.content;
- repoAsset.updateContent(text.content);
- }
-
- }
-
-
- String toDRL(FactMetaModel mm) {
- StringBuilder sb = new StringBuilder();
- sb.append("declare " + mm.name);
- for (int i = 0; i < mm.fields.size(); i++) {
- FieldMetaModel f = (FieldMetaModel) mm.fields.get(i);
- sb.append("\n\t");
- sb.append(f.name + ": " + f.type);
- }
- sb.append("\nend");
- return sb.toString();
- }
-
- List<FactMetaModel> toModel(String drl) throws DroolsParserException {
- if (drl != null && drl.startsWith("#advanced")) {
- throw new DroolsParserException("Using advanced editor");
- }
- DrlParser parser = new DrlParser();
- PackageDescr pkg = parser.parse(drl);
- if (parser.hasErrors()) {
- throw new DroolsParserException("The model drl " + drl + " is not valid");
- }
-
- if (pkg == null) return new ArrayList<FactMetaModel>();
- List<TypeDeclarationDescr> types = pkg.getTypeDeclarations();
- List<FactMetaModel> list = new ArrayList<FactMetaModel>(types.size());
- for (TypeDeclarationDescr td : types) {
- FactMetaModel mm = new FactMetaModel();
- mm.name = td.getTypeName();
- if (td.getMetaAttributes().size() > 0) {
- //can't do this yet
- throw new DroolsParserException("will have to use text for this");
- }
-
-
- Map<String, TypeFieldDescr> fields = td.getFields();
- for (Iterator<Map.Entry<String, TypeFieldDescr>> iterator = fields.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry<String, TypeFieldDescr> en = iterator.next();
- String fieldName = en.getKey();
- TypeFieldDescr descr = en.getValue();
- if (descr.getMetaAttributes().size() > 0) {
- //can't do this yet
- throw new DroolsParserException("using text");
- }
- FieldMetaModel fm = new FieldMetaModel(fieldName, descr.getPattern().getObjectType());
-
- mm.fields.add(fm);
- }
- list.add(mm);
- }
- return list;
- }
-
- String toDRL(List<FactMetaModel> models) {
- StringBuilder sb = new StringBuilder();
- for (FactMetaModel factMetaModel : models) {
- String drl = toDRL(factMetaModel);
- sb.append(drl + "\n\n");
- }
- return sb.toString().trim();
- }
-
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FunctionContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FunctionContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FunctionContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,22 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-/*
- * 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.
- */
-
-
-
-public class FunctionContentHandler extends PlainTextContentHandler {
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,91 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.IOException;
-import java.io.StringReader;
-
-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;
-import org.drools.ide.common.client.modeldriven.dt.GuidedDecisionTable;
-import org.drools.ide.common.server.util.GuidedDTDRLPersistence;
-import org.drools.ide.common.server.util.GuidedDTXMLPersistence;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-/**
- * For guided decision tables.
- *
- * @author Michael Neale
- */
-public class GuidedDTContentHandler extends ContentHandler
- implements
- IRuleAsset {
-
- public void retrieveAssetContent(RuleAsset asset,
- PackageItem pkg,
- AssetItem item) throws SerializableException {
- GuidedDecisionTable model = GuidedDTXMLPersistence.getInstance().unmarshal( item.getContent() );
-
- asset.content = model;
-
- }
-
- public void storeAssetContent(RuleAsset asset,
- AssetItem repoAsset) throws SerializableException {
- GuidedDecisionTable data = (GuidedDecisionTable) asset.content;
- if ( data.tableName == null ) {
- data.tableName = repoAsset.getName();
- }
-
- // Change the row numbers so they are in the same order as the rows.
- for ( int i = 0; i < data.data.length; i++ ) {
- data.data[i][0] = String.valueOf( i + 1 );
- }
-
- repoAsset.updateContent( GuidedDTXMLPersistence.getInstance().marshal( data ) );
- }
-
- public void compile(BRMSPackageBuilder builder,
- AssetItem asset,
- ContentPackageAssembler.ErrorLogger logger) throws DroolsParserException,
- IOException {
- String drl = getRawDRL( asset );
- if ( drl.equals( "" ) ) return;
- builder.addPackageFromDrl( new StringReader( drl ) );
- }
-
- public void assembleDRL(BRMSPackageBuilder builder,
- AssetItem asset,
- StringBuffer buf) {
- String drl = getRawDRL( asset );
- buf.append( drl );
- }
-
- public String getRawDRL(AssetItem asset) {
- GuidedDecisionTable model = GuidedDTXMLPersistence.getInstance().unmarshal( asset.getContent() );
- model.tableName = asset.getName();
- model.parentName = this.parentNameFromCategory( asset,
- model.parentName );
-
- return GuidedDTDRLPersistence.getInstance().marshal( model );
- }
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ICanHasAttachment.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ICanHasAttachment.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ICanHasAttachment.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,19 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-import java.io.IOException;
-
-import org.drools.repository.AssetItem;
-
-/**
- * =(^.^)=
- *
- * @author Toni Rikkola
- *
- */
-public interface ICanHasAttachment {
-
- public void onAttachmentAdded(AssetItem item) throws IOException;
-
- public void onAttachmentRemoved(AssetItem item) throws IOException;
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ICompilable.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ICompilable.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ICompilable.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,43 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.IOException;
-
-import org.drools.compiler.DroolsParserException;
-import org.drools.guvnor.server.builder.BRMSPackageBuilder;
-import org.drools.guvnor.server.builder.ContentPackageAssembler;
-import org.drools.repository.AssetItem;
-
-/**
- * This inferface indicates that an asset is a rule asset content type,
- * ie not a model, dsl etc that supports package compilation.
- *
- * @author Michael Neale
- */
-public interface ICompilable {
-
- /**
- * This will be called when the asset is required to compile itself,
- * in the context of the given builder.
- */
- public void compile(BRMSPackageBuilder builder,
- AssetItem asset,
- ContentPackageAssembler.ErrorLogger logger) throws DroolsParserException,
- IOException;
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/IValidating.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/IValidating.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/IValidating.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,16 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-import org.drools.guvnor.client.rpc.BuilderResult;
-import org.drools.repository.AssetItem;
-
-/**
- * This interface indicates that an asset can validate itself, and present errors if requested.
- * Each IRuleAsset can already do this, so its not really required for them. Only other non-rule type assets.
- * (eg supporting). The idea is that feedback can be provided where the user is entering stuff.
- */
-public interface IValidating {
-
- BuilderResult validateAsset(AssetItem asset);
-
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,142 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarInputStream;
-import java.util.regex.Pattern;
-
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.server.ServiceImplementation;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-/**
- * This is used for handling jar models for the rules.
- * @author Michael Neale
- */
-public class ModelContentHandler extends ContentHandler
- implements
- ICanHasAttachment {
-
- public void retrieveAssetContent(RuleAsset asset,
- PackageItem pkg,
- AssetItem item) throws SerializableException {
- // do nothing, as we have an attachment
- }
-
- public void storeAssetContent(RuleAsset asset,
- AssetItem repoAsset) throws SerializableException {
- // do nothing, as we have an attachment
- }
-
- /**
- * This is called when a model jar is attached, it will peer into it, and then automatically add imports
- * if there aren't any already in the package header configuration.
- */
- public void onAttachmentAdded(AssetItem asset) throws IOException {
-
- PackageItem pkg = asset.getPackage();
- StringBuilder header = createNewHeader( ServiceImplementation.getDroolsHeader( pkg ) );
-
- Set<String> imports = getImportsFromJar( asset.getBinaryContentAttachment() );
-
- for ( String importLine : imports ) {
- Pattern pattern = Pattern.compile("\\b" + importLine.replace(".", "\\.") + "\\b");
- if (!pattern.matcher(header).find()) {
- header.append( importLine ).append( "\n" );
- }
- }
-
- ServiceImplementation.updateDroolsHeader(header.toString(), pkg);
- pkg.checkin("Imports setup automatically on model import.");
-
- }
-
- public void onAttachmentRemoved(AssetItem item) throws IOException {
-
- PackageItem pkg = item.getPackage();
- StringBuilder header = createNewHeader( ServiceImplementation.getDroolsHeader( pkg ) );
-
- Set<String> imports = getImportsFromJar( item.getBinaryContentAttachment() );
-
- for ( String importLine : imports ) {
- String importLineWithLineEnd = importLine + "\n";
-
- header = removeImportIfItExists( header,
- importLineWithLineEnd );
- }
-
- ServiceImplementation.updateDroolsHeader( header.toString(),
- pkg );
-
- pkg.checkin( "Imports removed automatically on model archiving." );
-
- }
-
- private StringBuilder removeImportIfItExists(StringBuilder header,
- String importLine) {
- if ( header.indexOf( importLine ) >= 0 ) {
- int indexOfImportLine = header.indexOf( importLine );
- header = header.replace( indexOfImportLine,
- indexOfImportLine + importLine.length(),
- "" );
- }
- return header;
- }
-
- private StringBuilder createNewHeader(String header) {
- StringBuilder buf = new StringBuilder();
-
- if ( header != null ) {
- buf.append( header );
- buf.append( '\n' );
- }
- return buf;
- }
-
- private Set<String> getImportsFromJar(InputStream in) throws IOException {
- Set<String> imports = new HashSet<String>();
-
- JarInputStream jis = new JarInputStream( in );
- JarEntry entry = null;
- while ( (entry = jis.getNextJarEntry()) != null ) {
- if ( !entry.isDirectory() ) {
- if ( entry.getName().endsWith( ".class" ) && entry.getName().indexOf( '$' ) == -1 && !entry.getName().endsWith( "package-info.class" ) ) {
-
- String line = "import " + convertPathToName( entry.getName() );
- imports.add( line );
- }
- }
- }
-
- return imports;
- }
-
- public static String convertPathToName(String name) {
- return name.replace( ".class",
- "" ).replace( "/",
- "." );
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PlainTextContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PlainTextContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PlainTextContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,46 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-/*
- * 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.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-public abstract class PlainTextContentHandler extends ContentHandler {
-
-
- public void retrieveAssetContent(RuleAsset asset,
- PackageItem pkg,
- AssetItem item) throws SerializableException {
- //default to text, goode olde texte, just like mum used to make.
- RuleContentText text = new RuleContentText();
- text.content = item.getContent();
- asset.content = text;
-
- }
-
- public void storeAssetContent(RuleAsset asset,
- AssetItem repoAsset) throws SerializableException {
- repoAsset.updateContent( ((RuleContentText)asset.content).content );
-
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,70 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.ruleeditor.PropertiesHolder;
-import org.drools.guvnor.server.util.PropertiesPersistence;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-/**
- * Handle *.properties file as a content for rule asset instead of a binary
- * attachment
- *
- * @author Anton Arhipov
- */
-public class PropertiesHandler extends ContentHandler {
- public void retrieveAssetContent(RuleAsset asset, PackageItem pkg,
- AssetItem item) throws SerializableException {
- if (item.getContent() != null) {
- asset.content = PropertiesPersistence.getInstance().unmarshal(
- item.getContent());
- }
- }
-
- public void storeAssetContent(RuleAsset asset, AssetItem repoAsset)
- throws SerializableException {
- PropertiesHolder holder = (PropertiesHolder) asset.content;
- String toSave = PropertiesPersistence.getInstance().marshal(holder);
-
- InputStream input = null;
- try {
- try {
- input = new ByteArrayInputStream(toSave.getBytes("UTF-8"));
- repoAsset.updateBinaryContentAttachment(input);
- } finally {
- if (input != null) {
- input.close();
- }
- }
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- throw new RuntimeException(e); // TODO: ?
- } catch (IOException e) {
- e.printStackTrace();
- throw new RuntimeException(e);
- }
- }
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,170 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-/*
- * 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.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.drools.compiler.DroolsParserException;
-import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleFlowContentModel;
-import org.drools.guvnor.server.builder.BRMSPackageBuilder;
-import org.drools.guvnor.server.builder.RuleFlowContentModelBuilder;
-import org.drools.guvnor.server.builder.RuleFlowProcessBuilder;
-import org.drools.guvnor.server.builder.ContentPackageAssembler.ErrorLogger;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.compiler.xml.XmlProcessReader;
-import org.drools.compiler.xml.XmlRuleFlowProcessDumper;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-public class RuleFlowHandler extends ContentHandler
- implements
- ICompilable,
- ICanHasAttachment {
-
- public void retrieveAssetContent(RuleAsset asset,
- PackageItem pkg,
- AssetItem item) throws SerializableException {
-
- RuleFlowProcess process = readProcess( new ByteArrayInputStream( item.getContent().getBytes() ) );
-
- if ( process != null ) {
- RuleFlowContentModel content = RuleFlowContentModelBuilder.createModel( process );
- content.setXml( item.getContent() );
- asset.content = content;
- } else if ( process == null && !"".equals( item.getContent() ) ) {
- asset.content = new RuleFlowContentModel();
- //
- //
- // Migrate v4 ruleflows to v5
- // All we can do is put the old drools 4 rfm back as the xml so
- // that we can at least rebuild the package with it if the
- // migrate ruleflow system property is set true.
- //
- ((RuleFlowContentModel) asset.content).setXml( item.getContent() );
- }
-
- }
-
- protected RuleFlowProcess readProcess(InputStream is) {
-
- RuleFlowProcess process = null;
-
- try {
- InputStreamReader reader = new InputStreamReader( is );
- PackageBuilderConfiguration configuration = new PackageBuilderConfiguration();
- XmlProcessReader xmlReader = new XmlProcessReader( configuration.getSemanticModules() );
-
- try {
- process = (RuleFlowProcess) xmlReader.read( reader );
-
- } catch ( Exception e ) {
- reader.close();
- throw new Exception( "Unable to read rule flow XML." );
- }
- reader.close();
- } catch ( Exception e ) {
- return null;
- }
-
- return process;
- }
-
- public void storeAssetContent(RuleAsset asset,
- AssetItem repoAsset) throws SerializableException {
-
- RuleFlowContentModel content = (RuleFlowContentModel) asset.content;
-
- //
- // Migrate v4 ruleflows to v5
- // Added guards to check for nulls in the case where the ruleflows
- // have not been migrated from drools 4 to 5.
- //
- if ( content != null ) {
- if ( content.getXml() != null ) {
- RuleFlowProcess process = readProcess( new ByteArrayInputStream( content.getXml().getBytes() ) );
-
- if ( process != null ) {
- RuleFlowProcessBuilder.updateProcess( process,
- content.getNodes() );
-
- XmlRuleFlowProcessDumper dumper = XmlRuleFlowProcessDumper.INSTANCE;
- String out = dumper.dump( process );
-
- repoAsset.updateContent( out );
- } else {
- //
- // Migrate v4 ruleflows to v5
- // Put the old contents back as there is no updating possible
- //
- repoAsset.updateContent( content.getXml() );
- }
- }
- }
- }
-
- /**
- * The rule flow can not be built if the package name is not the same as the package that it exists in.
- * This changes the package name.
- *
- * @param item
- */
- public void onAttachmentAdded(AssetItem item) {
- String content = item.getContent();
-
- if ( content != null && !content.equals( "" ) ) {
- RuleFlowProcess process = readProcess( new ByteArrayInputStream( content.getBytes() ) );
-
- if ( process != null ) {
- String packageName = item.getPackageName();
- String originalPackageName = process.getPackageName();
-
- if ( !packageName.equals( originalPackageName ) ) {
- process.setPackageName( packageName );
-
- XmlRuleFlowProcessDumper dumper = XmlRuleFlowProcessDumper.INSTANCE;
- String out = dumper.dump( process );
-
- item.updateContent( out );
-
- item.checkin( "Changed rule flow package from " + originalPackageName + " to " + packageName );
- }
- }
- }
- }
-
- public void onAttachmentRemoved(AssetItem item) throws IOException {
- // Nothing to do when this asset type is removed.
- }
-
- public void compile(BRMSPackageBuilder builder,
- AssetItem asset,
- ErrorLogger logger) throws DroolsParserException,
- IOException {
- InputStream ins = asset.getBinaryContentAttachment();
- if ( ins != null ) {
- builder.addRuleFlow( new InputStreamReader( asset.getBinaryContentAttachment() ) );
- }
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ScenarioContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ScenarioContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ScenarioContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,28 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.ide.common.client.modeldriven.testing.Scenario;
-import org.drools.ide.common.server.util.ScenarioXMLPersistence;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-public class ScenarioContentHandler extends PlainTextContentHandler {
-
- @Override
- public void retrieveAssetContent(RuleAsset asset, PackageItem pkg,
- AssetItem item) throws SerializableException {
- Scenario sc = ScenarioXMLPersistence.getInstance().unmarshal(item.getContent());
- asset.content = sc;
-
- }
-
- @Override
- public void storeAssetContent(RuleAsset asset, AssetItem repoAsset)
- throws SerializableException {
- Scenario sc = (Scenario) asset.content;
- repoAsset.updateContent(ScenarioXMLPersistence.getInstance().marshal(sc));
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/TemplateModelHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/TemplateModelHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/TemplateModelHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,19 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-import org.drools.guvnor.server.util.BRDRTPersistence;
-import org.drools.guvnor.server.util.BRDRTXMLPersistence;
-import org.drools.ide.common.server.util.BRLPersistence;
-
-public class TemplateModelHandler extends BRLContentHandler {
-
- @Override
- protected BRLPersistence getBrlDrlPersistence() {
- return BRDRTPersistence.getInstance();
- }
-
- @Override
- protected BRLPersistence getBrlXmlPersistence() {
- return BRDRTXMLPersistence.getInstance();
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/WorkingSetHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/WorkingSetHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/WorkingSetHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,9 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-import org.drools.guvnor.client.rpc.WorkingSetConfigData;
-
-/**
- *
- */
-public class WorkingSetHandler extends BaseXStreamContentHandler<WorkingSetConfigData> {
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/XmlFileHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/XmlFileHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/XmlFileHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,39 +0,0 @@
-package org.drools.guvnor.server.contenthandler;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
-import org.drools.repository.AssetItem;
-import org.drools.repository.PackageItem;
-
-import org.drools.repository.model.client.exceptions.SerializableException;
-
-/**
- *
- */
-public class XmlFileHandler extends PlainTextContentHandler {
- public void retrieveAssetContent(RuleAsset asset, PackageItem pkg, AssetItem item)
- throws SerializableException {
- if (item.getContent() != null) {
- RuleContentText text = new RuleContentText();
- text.content = item.getContent();
- asset.content = text;
- }
- }
-
- public void storeAssetContent(RuleAsset asset, AssetItem repoAsset) throws SerializableException {
-
- RuleContentText text = (RuleContentText) asset.content;
-
- try {
- InputStream input = new ByteArrayInputStream(text.content.getBytes("UTF-8"));
- repoAsset.updateBinaryContentAttachment(input);
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- throw new RuntimeException(e);
- }
- }
-}
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AssetFileServlet.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AssetFileServlet.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AssetFileServlet.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -24,7 +24,6 @@
import javax.servlet.http.HttpServletResponse;
import org.drools.guvnor.client.common.HTMLFileManagerFields;
-import org.drools.guvnor.client.rpc.DetailedSerializableException;
import org.drools.guvnor.server.util.FormData;
/**
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -35,13 +35,6 @@
import org.drools.compiler.DroolsParserException;
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.ICanHasAttachment;
-import org.drools.guvnor.server.contenthandler.IRuleAsset;
-import org.drools.guvnor.server.repository.MigrateRepository;
import org.drools.guvnor.server.security.AdminType;
import org.drools.guvnor.server.security.RoleTypes;
import org.drools.guvnor.server.util.ClassicDRLImporter;
@@ -51,6 +44,13 @@
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
import org.drools.repository.RulesRepositoryException;
+import org.drools.repository.services.ContentManager;
+import org.drools.repository.services.internal.MigrateRepository;
+import org.drools.repository.services.internal.builder.BRMSPackageBuilder;
+import org.drools.repository.services.internal.builder.ContentPackageAssembler;
+import org.drools.repository.services.internal.contenthandlers.ContentHandler;
+import org.drools.repository.services.internal.contenthandlers.ICanHasAttachment;
+import org.drools.repository.services.internal.contenthandlers.IRuleAsset;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Destroy;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/GuvnorDroolsDocsBuilder.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/GuvnorDroolsDocsBuilder.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/GuvnorDroolsDocsBuilder.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -8,16 +8,16 @@
import org.drools.compiler.DroolsParserException;
import org.drools.doc.DroolsDocsBuilder;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.server.ServiceImplementation;
-import org.drools.guvnor.server.builder.BRMSPackageBuilder;
-import org.drools.guvnor.server.contenthandler.ContentHandler;
-import org.drools.guvnor.server.contenthandler.ContentManager;
-import org.drools.guvnor.server.contenthandler.IRuleAsset;
import org.drools.repository.AssetItem;
import org.drools.repository.CategoryItem;
import org.drools.repository.PackageItem;
import org.drools.repository.VersionableItem;
+import org.drools.repository.services.ContentManager;
+import org.drools.repository.services.assets.AssetFormats;
+import org.drools.repository.services.internal.builder.BRMSPackageBuilder;
+import org.drools.repository.services.internal.contenthandlers.ContentHandler;
+import org.drools.repository.services.internal.contenthandlers.IRuleAsset;
import org.drools.verifier.misc.DrlPackageParser;
import org.drools.verifier.misc.DrlRuleParser;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -29,15 +29,12 @@
import org.drools.compiler.DroolsParserException;
import org.drools.guvnor.client.rpc.BulkTestRunResult;
-import org.drools.guvnor.client.rpc.DetailedSerializableException;
import org.drools.guvnor.server.RepositoryServiceServlet;
import org.drools.guvnor.server.ServiceImplementation;
-import org.drools.guvnor.server.files.RepositoryServlet.A;
import org.drools.guvnor.server.util.FormData;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepositoryException;
-import org.drools.repository.remoteapi.Response;
-import org.drools.repository.remoteapi.RestAPI;
+import org.drools.repository.model.client.exceptions.DetailedSerializableException;
import org.drools.repository.model.client.exceptions.SerializableException;
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,165 +0,0 @@
-package org.drools.guvnor.server.repository;
-
-import javax.jcr.RepositoryException;
-
-import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.repository.AssetItem;
-import org.drools.repository.AssetItemIterator;
-import org.drools.repository.PackageItem;
-import org.drools.repository.PackageIterator;
-import org.drools.repository.RulesRepository;
-import org.drools.compiler.xml.processes.RuleFlowMigrator;
-
-import org.apache.log4j.Logger;
-
-/**
- * This class is used to migrate version 4 ruleflow assets in a version 4
- * or 5 drools repository into version 5 ruleflow assets.
- * IMPORTANT: the current code only performs the transformations if the
- * Drools system property drools.ruleflow.port is true, just as the
- * drools compiler only transforms version 4 ruleflows to 5 if this
- * property is set.
- *
- * If a ruleflow is migrated, it is checked in as new version so that
- * the previous version is preserved. The current code checks-in
- * the new version as the admin user with an appropriate comment indicating
- * that the flow has been migrated. Hover, the code could also be changed
- * to check-in each migrated ruleflow using the credentials of the last
- * person to check-in the ruleflow, however, in future there may be a
- * danger that the person who last checked in the file may have lost
- * privileges to check-in the file, so we use the admin user
- * for now.
- *
- * @author Shahad Ahmed
- */
-public class MigrateRepository {
-
- private static final Logger log = Logger.getLogger( MigrateRepository.class );
-
-
- /*************************************************************************
- * Returns true if the drools system property drools.ruleflow.port is true
- * indicating that ruleflow migration should be performed.
- * @param repo
- * @return true if the drools system property drools.ruleflow.port is true
- * indicating that ruleflow migration should be performed.
- * @throws RepositoryException
- ************************************************************************/
- public static boolean needsRuleflowMigration(RulesRepository repo) throws RepositoryException {
- String portRuleFlow = System.getProperty( "drools.ruleflow.port", "false" );
- return portRuleFlow.equalsIgnoreCase("true");
- }
-
-
- /*************************************************************************
- * Iterates through all the packages in the given repository
- * migrating all drools 4 .rfm and .rf ruleflow assets that need to be
- * migrated to 5.
- * Note that archived assets, and assets in snapshots are also migrated.
- * @param repo
- * @throws RepositoryException
- ************************************************************************/
- public static void migrateRuleflows(RulesRepository repo) throws RepositoryException
- {
- log.debug("AUTO MIGRATION: Performing drools ruleflow migration...");
-
- PackageIterator pkgs = repo.listPackages();
- boolean performed = false;
- while(pkgs.hasNext()) {
- performed = true;
- PackageItem pkg = (PackageItem) pkgs.next();
- migrateRuleflows(pkg);
-
- String[] snaps = repo.listPackageSnapshots(pkg.getName());
- if (snaps != null) {
- for (int i = 0; i < snaps.length; i++) {
- PackageItem snap = repo.loadPackageSnapshot(pkg.getName(), snaps[i]);
- migrateRuleflows(snap);
- }
- }
- }
-
- if (performed) {
- log.debug("AUTO MIGRATION: Drools rulesflow migration completed.");
- }
- }
-
-
- /*************************************************************************
- * migrate all ruleflows in the package, including archived ones.
- * The migrated ruleflow is checked in as a new version and previous
- * versions are not migrated.
- * NOTE that we always try to migrate if the drools.ruleflow.port
- * property is true, even if the repository has been migrated before.
- * This is needed as the drools.ruleflow.port property may have been
- * false when the repository was first migrated (i.e. the
- * HEADER_PROPERTY_NAME above may have been migrated, but not the
- * ruleflows).
- * Also, all snapshot packages are updated as well.
- * @param pkg
- ************************************************************************/
- private static void migrateRuleflows(PackageItem pkg)
- {
- String portRuleFlow = System.getProperty( "drools.ruleflow.port", "false" );
- if ( portRuleFlow.equalsIgnoreCase( "true" ) )
- {
- AssetItemIterator it = listAssetsByFormatIncludingArchived(pkg,
- new String[]{AssetFormats.RULE_FLOW_RF});
-
- while(it.hasNext())
- {
- AssetItem item = it.next();
- String rf = item.getContent();
- try
- {
- if(RuleFlowMigrator.needToMigrateRFM(rf))
- {
- log.debug("Migrating v4 RFM to v5: " + item.getName());
- rf = RuleFlowMigrator.portRFMToCurrentVersion(rf);
- item.updateContent(rf);
- item.checkin("Auto migration from ruleflow RFM version 4 to 5");
- }
- else if(RuleFlowMigrator.needToMigrateRF(rf))
- {
- log.debug("Migrating v4 RF to v5: " + item.getName());
- rf = RuleFlowMigrator.portRFToCurrentVersion(rf);
- item.updateContent(rf);
- item.checkin("Auto migration from ruleflow RF version 4 to 5");
- }
- }
- catch (Exception ex)
- {
- log.error("Ruleflow migration failed for item: "
- + item.getName() + " due to " + ex);
- ex.printStackTrace(System.out);
- }
-
- }
- }
- }
-
-
- /*************************************************************************
- * This will load an iterator for assets in the given package of the
- * given format type, including archived assets.
- * @param pkg The package to check
- * @param formats an array of the format types to find.
- * @return an iterator for assets of the given format type, including
- * archived assets.
- ************************************************************************/
- private static AssetItemIterator listAssetsByFormatIncludingArchived(PackageItem pkg,
- String[] formats) {
- if (formats.length == 1) {
- return pkg.queryAssets( "drools:format='" + formats[0] + "'" , true);
- } else {
- String predicate = " ( ";
- for ( int i = 0; i < formats.length; i++ ) {
- predicate = predicate + "drools:format='" + formats[i] + "'";
- if (!(i == formats.length -1 )) { predicate = predicate + " OR "; }
- }
- predicate = predicate + " ) ";
- return pkg.queryAssets( predicate , true);
- }
- }
-
-}
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -26,6 +26,7 @@
import org.drools.repository.*;
import org.drools.repository.events.StorageEventManager;
import org.drools.repository.events.CheckinEvent;
+import org.drools.repository.services.internal.MigrateRepository;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RulesRepositoryManager.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RulesRepositoryManager.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RulesRepositoryManager.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-
-
import org.drools.repository.RulesRepository;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/SampleSaveEvent.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/SampleSaveEvent.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/SampleSaveEvent.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -4,15 +4,14 @@
import java.util.HashMap;
import java.util.List;
-import org.drools.repository.events.SaveEvent;
-import org.drools.repository.AssetItem;
-import org.drools.repository.CategoryItem;
-import org.drools.repository.PackageItem;
-import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.ide.common.client.modeldriven.brl.RuleAttribute;
import org.drools.ide.common.client.modeldriven.brl.RuleModel;
import org.drools.ide.common.server.util.BRDRLPersistence;
import org.drools.ide.common.server.util.BRXMLPersistence;
+import org.drools.repository.AssetItem;
+import org.drools.repository.CategoryItem;
+import org.drools.repository.PackageItem;
+import org.drools.repository.events.SaveEvent;
+import org.drools.repository.services.assets.AssetFormats;
/**
* @author Michael Neale
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/UserInbox.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/UserInbox.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/UserInbox.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,20 +1,24 @@
package org.drools.guvnor.server.repository;
-import org.drools.repository.RulesRepository;
-import org.drools.repository.UserInfo;
-import org.drools.repository.AssetItem;
-import org.drools.guvnor.server.util.LoggingHelper;
+import static org.drools.guvnor.client.common.Inbox.INCOMING;
+import static org.drools.guvnor.client.common.Inbox.RECENT_EDITED;
+import static org.drools.guvnor.client.common.Inbox.RECENT_VIEWED;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+
import org.apache.log4j.Logger;
-import static org.drools.guvnor.client.common.Inbox.*;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.rpc.TableDataResult;
import org.drools.guvnor.client.rpc.TableDataRow;
+import org.drools.guvnor.server.util.LoggingHelper;
+import org.drools.repository.AssetItem;
+import org.drools.repository.RulesRepository;
+import org.drools.repository.UserInfo;
+import org.drools.repository.services.assets.AssetFormats;
-import javax.jcr.RepositoryException;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
-
import com.thoughtworks.xstream.XStream;
/**
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/Allow.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/Allow.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/Allow.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,12 +0,0 @@
-package org.drools.guvnor.server.selector;
-
-/**
- * This is a simple named fact for the selectors.
- * @author michaelneale
- *
- */
-public class Allow {
-
- public Allow() {}
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/AssetSelector.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/AssetSelector.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/AssetSelector.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,25 +0,0 @@
-package org.drools.guvnor.server.selector;
-
-import org.drools.repository.AssetItem;
-
-
-/**
- *
- * Asset selectors can be used to choose if an asset is part of a build.
- *
- * Asset selectors should be stateless, they will be called multiple times.
- *
- * @author Michael Neale
- *
- */
-public interface AssetSelector {
-
-
- /**
- *
- * @param asset The asset to be tested.
- * @return true if asset it allowed.
- */
- boolean isAssetAllowed(AssetItem asset);
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/BuiltInSelector.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/BuiltInSelector.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/BuiltInSelector.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,116 +0,0 @@
-package org.drools.guvnor.server.selector;
-
-import org.drools.guvnor.server.security.CategoryPathType;
-import org.drools.guvnor.server.security.RoleTypes;
-import org.drools.repository.AssetItem;
-import org.drools.repository.CategoryItem;
-import org.jboss.seam.security.Identity;
-
-public class BuiltInSelector implements AssetSelector {
- private String status;
- private String statusOperator;
- private String category;
- private String categoryOperator;
- private boolean enableStatusSelector;
- private boolean enableCategorySelector;
-
- public BuiltInSelector() {
- }
-
- public boolean isEnableStatusSelector() {
- return enableStatusSelector;
- }
-
- public void setEnableStatusSelector(boolean enableStatusSelector) {
- this.enableStatusSelector = enableStatusSelector;
- }
-
- public boolean isEnableCategorySelector() {
- return enableCategorySelector;
- }
-
- public void setEnableCategorySelector(boolean enableCategorySelector) {
- this.enableCategorySelector = enableCategorySelector;
- }
-
- public String getCategory() {
- return category;
- }
-
- public void setCategory(String category) {
- this.category = category;
- }
-
- public String getCategoryOperator() {
- return categoryOperator;
- }
-
- public void setCategoryOperator(String categoryOperator) {
- this.categoryOperator = categoryOperator;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getStatusOperator() {
- return statusOperator;
- }
-
- public void setStatusOperator(String statusOperator) {
- this.statusOperator = statusOperator;
- }
-
- public boolean isAssetAllowed(AssetItem item) {
- if(enableStatusSelector && enableCategorySelector) {
- return (isStatusAllowed(item) && isCategoryAllowed(item));
- } else if (enableStatusSelector) {
- return isStatusAllowed(item);
- } else if (enableCategorySelector) {
- return isCategoryAllowed(item);
- }
-
- //allow everything if none enabled.
- return true;
- }
-
- private boolean isStatusAllowed(AssetItem item) {
- if("=".equals(statusOperator)) {
- if (item.getStateDescription().equals(status))
- return true;
- else
- return false;
- } else if ("!=".equals(statusOperator)) {
- if (!item.getStateDescription().equals(status))
- return true;
- else
- return false;
- }
-
- return false;
- }
-
- private boolean isCategoryAllowed(AssetItem item) {
- if("=".equals(categoryOperator)) {
- for ( CategoryItem cat : item.getCategories() ) {
- if (cat.getName().equals(category)) {
- return true;
- }
- }
- return false;
- } else if ("!=".equals(categoryOperator)) {
- for ( CategoryItem cat : item.getCategories() ) {
- if (!cat.getName().equals(category)) {
- return true;
- }
- }
- return false;
- }
-
- return false;
- }
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,66 +0,0 @@
-package org.drools.guvnor.server.selector;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.apache.log4j.Logger;
-import org.drools.CheckedDroolsException;
-import org.drools.RuleBase;
-import org.drools.RuntimeDroolsException;
-import org.drools.StatelessSession;
-import org.drools.StatelessSessionResult;
-import org.drools.compiler.RuleBaseLoader;
-import org.drools.repository.AssetItem;
-
-/**
- * This uses rules to decide if an asset is to be included in a build.
- *
- * @author Michael Neale
- *
- */
-public class RuleBasedSelector implements AssetSelector {
-
- private static final Logger log = Logger.getLogger( RuleBasedSelector.class );
-
-
- String ruleFile;
- private RuleBase ruleBase;
-
- public RuleBasedSelector(String val) {
- this.ruleFile = val;
-
- InputStream ins = this.getClass().getResourceAsStream( ruleFile );
- InputStreamReader reader = new InputStreamReader(ins);
-
-
- try {
- this.ruleBase = RuleBaseLoader.getInstance().loadFromReader( reader );
- } catch ( CheckedDroolsException e ) {
- log.error( e );
- throw new RuntimeDroolsException(e);
- } catch ( IOException e ) {
- log.error( e );
- throw new RuntimeDroolsException(e);
- }
-
- }
-
- public boolean isAssetAllowed(AssetItem asset) {
- return evalRules( asset );
- }
-
- boolean evalRules(Object asset) {
- StatelessSession session = ruleBase.newStatelessSession();
- StatelessSessionResult result = session.executeWithResults( asset );
-
- java.util.Iterator objects = result.iterateObjects();
- while(objects.hasNext()) {
- if (objects.next() instanceof Allow) {
- return true;
- }
- }
- return false;
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,97 +0,0 @@
-package org.drools.guvnor.server.selector;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-import org.drools.repository.AssetItem;
-
-
-public class SelectorManager {
-
- private static final Logger log = Logger.getLogger( SelectorManager.class );
- public static String SELECTOR_CONFIG_PROPERTIES = "/selectors.properties";
- private static final SelectorManager INSTANCE = new SelectorManager(SELECTOR_CONFIG_PROPERTIES);
-
- /**
- * This is a map of the selectors to use.
- */
- public final Map<String, AssetSelector> selectors = new HashMap<String, AssetSelector>();
-
- SelectorManager(String configPath) {
- log.debug("Loading selectors");
- Properties props = new Properties();
- try {
- props.load(this.getClass().getResourceAsStream(configPath));
- props.put("BuiltInSelector", "org.drools.guvnor.server.selector.BuiltInSelector");
- for (Iterator iter = props.keySet().iterator(); iter.hasNext();) {
- String selectorName = (String) iter.next();
- String val = props.getProperty(selectorName);
- try {
- if (val.endsWith("drl")) {
- selectors.put(selectorName ,loadRuleSelector( val) );
- } else {
- selectors.put(selectorName, loadSelectorImplementation( val ));
- }
- } catch (Exception e) {
- log.error("Unable to load a selector [" + val + "]", e);
- }
- }
- } catch (IOException e) {
- log.error("Unable to load selectors.", e);
- }
- }
-
- /**
- * Return a selector. If the name is null or empty it will return a nil/default selector
- * (one that lets everything through). If the selector is not found, it will return null;
- */
- public AssetSelector getSelector(String name) {
- if (name == null || "".equals(name.trim())) {
- return nilSelector();
- } else {
- if (this.selectors.containsKey( name )) {
- return this.selectors.get( name );
- } else {
- log.debug( "No selector found by the name of " + name );
- return null;
- }
- }
- }
-
- public String[] getCustomSelectors() {
- Set<String> s = selectors.keySet();
- List<String> selectorList = new ArrayList<String>();
- selectorList.addAll(s);
- selectorList.remove("BuiltInSelector");
- String[] result = new String[selectorList.size()];
- return selectorList.toArray(result);
- }
-
- private AssetSelector nilSelector() {
- return new AssetSelector() {
- public boolean isAssetAllowed(AssetItem asset) {
- return true;
- }
- };
- }
-
- private AssetSelector loadSelectorImplementation(String val) throws Exception {
- return (AssetSelector) Thread.currentThread().getContextClassLoader().loadClass( val ).newInstance();
- }
-
- private AssetSelector loadRuleSelector(String val) {
-
- return new RuleBasedSelector(val);
- }
-
- public static SelectorManager getInstance() {
- return INSTANCE;
- }
-}
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/AssetFormatHelper.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/AssetFormatHelper.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/AssetFormatHelper.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -4,8 +4,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.repository.RulesRepositoryException;
+import org.drools.repository.services.assets.AssetFormats;
/**
* Needed to list what registered format types there are.
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRDRTPersistence.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRDRTPersistence.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRDRTPersistence.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,97 +0,0 @@
-package org.drools.guvnor.server.util;
-
-import java.io.ByteArrayInputStream;
-
-import org.drools.ide.common.client.modeldriven.brl.RuleModel;
-import org.drools.ide.common.client.modeldriven.dt.TemplateModel;
-import org.drools.ide.common.server.util.BRDRLPersistence;
-import org.drools.ide.common.server.util.BRLPersistence;
-import org.drools.template.DataProvider;
-import org.drools.template.DataProviderCompiler;
-import org.drools.template.objects.ArrayDataProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class persists a {@link TemplateModel} to DRL template
- *
- * @author baunax
- */
-public class BRDRTPersistence extends BRDRLPersistence {
- private static final Logger log = LoggerFactory.getLogger(BRDRTPersistence.class);
- private static final BRLPersistence INSTANCE = new BRDRTPersistence();
- private static final String PACKAGE_DECLARATION = "\npackage __template_dummy_package__\n";
-
- private BRDRTPersistence() {
- super();
- }
-
- public static BRLPersistence getInstance() {
- return INSTANCE;
- }
-
- @Override
- public String marshal(RuleModel model) {
- TemplateModel tplModel = (TemplateModel) model;
- String ruleTemplate = super.marshalRule(model);
- log.debug("ruleTemplate:\n{}", ruleTemplate);
- DataProviderCompiler tplCompiler = new DataProviderCompiler();
- DataProvider dataProvider;
- if (tplModel.getRowsCount() > 0) {
- dataProvider = new ArrayDataProvider(tplModel.getTableAsArray());
- } else {
- dataProvider = new ArrayDataProvider(generateEmptyIterator(tplModel));
- }
-
- String generatedDRl = tplCompiler.compile(dataProvider, new ByteArrayInputStream(ruleTemplate.getBytes()))
- .substring(PACKAGE_DECLARATION.length()).trim();
-
- log.debug("generated drl:\n{}", generatedDRl);
- return generatedDRl;
- }
-
- private String[][] generateEmptyIterator(TemplateModel tplModel) {
- String[][] rows = new String[1][];
-
- String[] interpolationVariables = tplModel.getInterpolationVariablesList();
- if (interpolationVariables == null || interpolationVariables.length == 0) {
- rows[0] = new String[] { "" };
- } else {
- for (int i = 0; i < interpolationVariables.length; i++) {
- interpolationVariables[i] += "_na";
- }
- rows[0] = interpolationVariables;
- }
- return rows;
- }
-
- @Override
- protected void marshalHeader(RuleModel model, StringBuilder buf) {
- TemplateModel tplModel = (TemplateModel) model;
- buf.append("template header\n");
-
- String[] interpolationVariables = tplModel.getInterpolationVariablesList();
- if (interpolationVariables.length == 0) {
- buf.append("test_var").append('\n');
- } else {
- for (String var : interpolationVariables) {
- buf.append(var).append('\n');
- }
- }
- buf.append(PACKAGE_DECLARATION)
- .append("\ntemplate \"" + super.marshalRuleName(tplModel) + "\"\n\n");
- super.marshalHeader(model, buf);
- }
-
- @Override
- protected String marshalRuleName(RuleModel model) {
- return super.marshalRuleName(model) + "_@{row.rowNumber}";
- }
-
- @Override
- protected void marshalFooter(StringBuilder buf) {
- super.marshalFooter(buf);
- buf.append("\nend template");
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRDRTXMLPersistence.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRDRTXMLPersistence.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRDRTXMLPersistence.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,45 +0,0 @@
-package org.drools.guvnor.server.util;
-
-import org.drools.ide.common.client.modeldriven.brl.RuleModel;
-import org.drools.ide.common.client.modeldriven.dt.TemplateModel;
-import org.drools.ide.common.server.util.BRLPersistence;
-import org.drools.ide.common.server.util.BRXMLPersistence;
-
-/**
- * This class persists the template rule model to XML and back.
- *
- * This is the 'brl' xml format (Business Rule Language).
- *
- * @author baunax at gmail.com
- * @author dieguitoll at gmail.com
- */
-public class BRDRTXMLPersistence extends BRXMLPersistence {
-
- private static final BRLPersistence INSTANCE = new BRDRTXMLPersistence();
-
- private BRDRTXMLPersistence() {
- super();
- }
-
- public static BRLPersistence getInstance() {
- return INSTANCE;
- }
-
- @Override
- public String marshal(RuleModel model) {
- ((TemplateModel) model).putInSync();
- return super.marshal(model);
- }
-
- @Override
- public TemplateModel unmarshal(String xml) {
- TemplateModel model = (TemplateModel) super.unmarshal(xml);
- model.putInSync();
- return model;
- }
-
- @Override
- protected RuleModel createEmptyModel() {
- return new TemplateModel();
- }
-}
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -22,9 +22,7 @@
import java.util.Set;
import java.util.jar.JarInputStream;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.server.ServiceImplementation;
-import org.drools.guvnor.server.builder.BRMSPackageBuilder;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.server.rules.SuggestionCompletionLoader;
import org.drools.lang.descr.ImportDescr;
@@ -32,6 +30,8 @@
import org.drools.repository.AssetItem;
import org.drools.repository.AssetItemIterator;
import org.drools.repository.PackageItem;
+import org.drools.repository.services.assets.AssetFormats;
+import org.drools.repository.services.internal.builder.BRMSPackageBuilder;
/**
* This decorates the suggestion completion loader with BRMS specific stuff.
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -31,8 +31,8 @@
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.lang.descr.RuleDescr;
+import org.drools.repository.services.assets.AssetFormats;
/**
* This class imports legacy DRL into a structure suitable for storing more
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/MetaDataMapper.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/MetaDataMapper.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/MetaDataMapper.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,175 +0,0 @@
-package org.drools.guvnor.server.util;
-/*
- * 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.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.drools.guvnor.client.rpc.MetaData;
-import org.drools.repository.RulesRepositoryException;
-
-/**
- * This utility uses reflection to map from the MetaData DTO to
- * the AssetItem back end class, to adhere to the DRY principle.
- *
- * AssetItem is not a remotable instance, but MetaData is.
- *
- * @author Michael Neale
- */
-public class MetaDataMapper {
-
-
- private Map writeMappingsForClass = new HashMap();
-
- private Map readMappipngsForClass = new HashMap();
-
- public void copyFromMetaData(MetaData data, Object target) {
- Map writeMappings = getWriteMappings( data,
- target );
-
- for ( Iterator iter = writeMappings.entrySet().iterator(); iter.hasNext(); ) {
- Map.Entry e = (Map.Entry) iter.next();
- Field f = (Field) e.getKey();
- Method m = (Method) e.getValue();
-
- try {
- m.invoke( target, new Object[] {f.get( data )} ) ;
- } catch ( IllegalArgumentException e1 ) {
- throw new RulesRepositoryException(e1);
- } catch ( IllegalAccessException e1 ) {
- throw new RulesRepositoryException(e1);
- } catch ( InvocationTargetException e1 ) {
- throw new RulesRepositoryException(e1);
- }
-
- }
-
- }
-
- private Map getWriteMappings(MetaData data,
- Object target) {
- if (!this.writeMappingsForClass.containsKey( target.getClass() )) {
- Map writeMappings = loadWriteMappings( data,
- target.getClass() );
- writeMappingsForClass.put( target.getClass(), writeMappings );
- }
- return (Map) writeMappingsForClass.get( target.getClass() );
- }
-
- private Map loadWriteMappings(MetaData data,
- Class bean) {
- Map mappings = new HashMap();
- Field fields[] = data.getClass().getFields();
- for ( int i = 0; i < fields.length; i++ ) {
- Field f = fields[i];
- String old = f.getName();
- String name = Character.toUpperCase( old.charAt( 0 ) ) + old.substring( 1 );
-
- name = "update" + name;
-
-
- Method m;
- try {
- m = bean.getMethod( name, new Class[] {f.getType()} );
- mappings.put( f,
- m );
- } catch ( SecurityException e ) {
- throw new RulesRepositoryException( "Unable to map meta data",
- e );
- } catch ( NoSuchMethodException e ) {
- //ignore
- }
-
- }
- return mappings;
- }
-
- public void copyToMetaData(MetaData data,
- Object source) {
- Map readMappings = getReadMappings( data,
- source );
-
- for ( Iterator iter = readMappings.entrySet().iterator(); iter.hasNext(); ) {
- Map.Entry e = (Map.Entry) iter.next();
- Field f = (Field) e.getKey();
- Method m = (Method) e.getValue();
-
- try {
- f.set( data, m.invoke( source, null ) );
- } catch ( IllegalArgumentException e1 ) {
- throw new RulesRepositoryException(e1);
- } catch ( IllegalAccessException e1 ) {
- throw new RulesRepositoryException(e1);
- } catch ( InvocationTargetException e1 ) {
- throw new RulesRepositoryException(e1);
- }
-
- }
-
- }
-
- private Map getReadMappings(MetaData data,
- Object source) {
- if (!this.readMappipngsForClass.containsKey( source.getClass() )) {
- this.readMappipngsForClass.put( source.getClass(), loadReadMappings( data,
- source.getClass() ) );
- }
- return (Map) this.readMappipngsForClass.get( source.getClass() );
- }
-
- private Map loadReadMappings(MetaData data,
- Class bean) {
-
- Map mappings = new HashMap();
- Field fields[] = data.getClass().getFields();
- for ( int i = 0; i < fields.length; i++ ) {
- Field f = fields[i];
- String old = f.getName();
- String name = Character.toUpperCase( old.charAt( 0 ) ) + old.substring( 1 );
-
- if ( f.getType() == Boolean.class ) {
- name = "is" + name;
- } else {
- name = "get" + name;
- }
-
- Method m;
- try {
- m = bean.getMethod( name, null );
- if (f.getType() == m.getReturnType())
- {
- mappings.put( f,
- m );
- }
- } catch ( SecurityException e ) {
- throw new RulesRepositoryException( "Unable to map meta data",
- e );
- } catch ( NoSuchMethodException e ) {
- //ignore
- }
-
- }
- return mappings;
-
- }
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/PropertiesPersistence.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/PropertiesPersistence.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/PropertiesPersistence.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,65 +0,0 @@
-package org.drools.guvnor.server.util;
-
-/*
- * 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.ArrayList;
-import java.util.List;
-
-import org.drools.guvnor.client.ruleeditor.PropertiesHolder;
-import org.drools.guvnor.client.ruleeditor.PropertyHolder;
-
-/**
- * used to convert PropertiesHolder to text and back
- *
- * @author Anton Arhipov
- */
-public class PropertiesPersistence {
-
- private static PropertiesPersistence INSTANCE = new PropertiesPersistence();
-
- private PropertiesPersistence() {
- }
-
- public static PropertiesPersistence getInstance() {
- return INSTANCE;
- }
-
- public String marshal(PropertiesHolder holder) {
- StringBuilder sb = new StringBuilder();
- for (PropertyHolder propertyHolder : holder.list) {
- sb.append(propertyHolder.name).append("=").append(
- propertyHolder.value).append("\n");
- }
- return sb.toString();
- }
-
- public PropertiesHolder unmarshal(String properties) {
- List<PropertyHolder> list = new ArrayList<PropertyHolder>();
- String[] props = properties.split("\n");
- if (props != null) {
- for (String s : props) {
- String[] pair = s.split("=");
- if (pair.length == 2) {
- list.add(new PropertyHolder(pair[0], pair[1]));
- }
- }
- }
- PropertiesHolder result = new PropertiesHolder();
- result.list = list;
- return result;
- }
-
-}
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierReportCreator.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierReportCreator.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierReportCreator.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -7,15 +7,14 @@
import java.util.Map;
import java.util.Set;
-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.Cause;
+import org.drools.repository.model.client.AnalysisFactUsage;
+import org.drools.repository.model.client.AnalysisFieldUsage;
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.model.client.AnalysisReportLine;
+import org.drools.repository.model.client.Cause;
import org.drools.verifier.components.Field;
import org.drools.verifier.components.ObjectType;
import org.drools.verifier.components.PatternComponent;
-import org.drools.verifier.components.Restriction;
import org.drools.verifier.components.VerifierComponentType;
import org.drools.verifier.components.VerifierRule;
import org.drools.verifier.data.VerifierData;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -4,16 +4,16 @@
import java.util.Collection;
import org.drools.builder.ResourceType;
-import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.guvnor.client.rpc.AnalysisReport;
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.io.ResourceFactory;
import org.drools.repository.AssetItem;
import org.drools.repository.AssetItemIterator;
import org.drools.repository.PackageItem;
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.services.ContentManager;
+import org.drools.repository.services.assets.AssetFormats;
+import org.drools.repository.services.internal.contenthandlers.ContentHandler;
+import org.drools.repository.services.internal.contenthandlers.IRuleAsset;
import org.drools.verifier.DefaultVerifierConfiguration;
import org.drools.verifier.Verifier;
import org.drools.verifier.VerifierConfiguration;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -19,6 +19,8 @@
import junit.framework.TestCase;
+import org.drools.repository.services.assets.AssetFormats;
+
public class AssetFormatsTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -17,6 +17,8 @@
+import org.drools.repository.model.client.MetaData;
+
import junit.framework.TestCase;
public class MetaDataTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -19,7 +19,7 @@
import junit.framework.TestCase;
-import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.repository.services.assets.AssetFormats;
public class EditorLauncherTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/PopulateDataTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -25,7 +25,6 @@
import junit.framework.TestCase;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.rpc.PackageConfigData;
import org.drools.guvnor.server.files.FileManagerUtils;
import org.drools.guvnor.server.security.RoleTypes;
@@ -34,8 +33,8 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
-
import org.drools.repository.model.client.exceptions.SerializableException;
+import org.drools.repository.services.assets.AssetFormats;
/**
* This class will setup the data in a test state, which is
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -8,10 +8,7 @@
import junit.framework.TestCase;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.rpc.MetaDataQuery;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
import org.drools.guvnor.client.rpc.TableDataResult;
import org.drools.guvnor.client.rulelist.AssetItemGrid;
import org.drools.guvnor.server.security.MockIdentity;
@@ -23,6 +20,9 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.RuleContentText;
+import org.drools.repository.services.assets.AssetFormats;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.security.AuthorizationException;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -34,18 +34,12 @@
import org.drools.core.util.BinaryRuleBaseLoader;
import org.drools.core.util.DateUtils;
import org.drools.core.util.DroolsStreamUtils;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.client.common.Inbox;
-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.DiscussionRecord;
import org.drools.guvnor.client.rpc.MetaDataQuery;
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.SingleScenarioResult;
@@ -91,14 +85,19 @@
import org.drools.repository.RulesRepository;
import org.drools.repository.RulesRepositoryException;
import org.drools.repository.StateItem;
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.model.client.BuilderResult;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.RuleContentText;
+import org.drools.repository.model.client.exceptions.DetailedSerializableException;
+import org.drools.repository.model.client.exceptions.SerializableException;
+import org.drools.repository.services.assets.AssetFormats;
import org.drools.rule.Package;
import org.drools.type.DateFormatsImpl;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.security.permission.RoleBasedPermissionResolver;
-import org.drools.repository.model.client.exceptions.SerializableException;
-
/**
* This is really a collection of integration tests.
* @author Michael Neale
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -26,11 +26,12 @@
import junit.framework.TestCase;
+import org.drools.builder.conf.DefaultPackageNameOption;
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.dsl.DSLTokenizedMappingFile;
+import org.drools.repository.services.internal.builder.BRMSPackageBuilder;
import org.drools.rule.Package;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
-import org.drools.builder.conf.DefaultPackageNameOption;
public class BRMSPackageBuilderTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -16,9 +16,9 @@
* limitations under the License.
*/
+import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.StringReader;
-import java.io.ByteArrayInputStream;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -32,10 +32,7 @@
import org.drools.RuleBaseFactory;
import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.server.ServiceImplementation;
-import org.drools.guvnor.server.selector.AssetSelector;
-import org.drools.guvnor.server.selector.SelectorManager;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.ActionFieldValue;
@@ -47,6 +44,12 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.drools.repository.services.assets.AssetFormats;
+import org.drools.repository.services.internal.builder.BRMSPackageBuilder;
+import org.drools.repository.services.internal.builder.ContentAssemblyError;
+import org.drools.repository.services.internal.builder.ContentPackageAssembler;
+import org.drools.repository.services.internal.selectors.AssetSelector;
+import org.drools.repository.services.internal.selectors.SelectorManager;
import org.drools.rule.Package;
import org.drools.rule.Rule;
import org.drools.ruleflow.core.RuleFlowProcess;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -19,14 +19,25 @@
import junit.framework.TestCase;
-import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.guvnor.client.rpc.BuilderResult;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.ide.common.client.modeldriven.dt.GuidedDecisionTable;
import org.drools.ide.common.server.util.GuidedDTXMLPersistence;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.drools.repository.model.client.BuilderResult;
+import org.drools.repository.services.ContentManager;
+import org.drools.repository.services.assets.AssetFormats;
+import org.drools.repository.services.internal.contenthandlers.BRLContentHandler;
+import org.drools.repository.services.internal.contenthandlers.DRLFileContentHandler;
+import org.drools.repository.services.internal.contenthandlers.DSLDefinitionContentHandler;
+import org.drools.repository.services.internal.contenthandlers.DSLRuleContentHandler;
+import org.drools.repository.services.internal.contenthandlers.DecisionTableXLSHandler;
+import org.drools.repository.services.internal.contenthandlers.DefaultContentHandler;
+import org.drools.repository.services.internal.contenthandlers.EnumerationContentHandler;
+import org.drools.repository.services.internal.contenthandlers.FactModelContentHandler;
+import org.drools.repository.services.internal.contenthandlers.GuidedDTContentHandler;
+import org.drools.repository.services.internal.contenthandlers.ModelContentHandler;
public class ContentHandlerTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -2,7 +2,10 @@
import junit.framework.TestCase;
-import org.drools.guvnor.client.common.AssetFormats;
+import org.drools.repository.services.ContentManager;
+import org.drools.repository.services.assets.AssetFormats;
+import org.drools.repository.services.internal.contenthandlers.DRLFileContentHandler;
+import org.drools.repository.services.internal.contenthandlers.ScenarioContentHandler;
public class ContentManagerTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -18,6 +18,8 @@
import junit.framework.TestCase;
+import org.drools.repository.services.internal.contenthandlers.DRLFileContentHandler;
+
public class DRLFileContentHandlerTest extends TestCase {
public void testSniffDRLType() throws Exception {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/FactModelContentHandlerTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -6,15 +6,16 @@
import junit.framework.TestCase;
import org.drools.compiler.DroolsParserException;
-import org.drools.guvnor.client.factmodel.FactMetaModel;
-import org.drools.guvnor.client.factmodel.FactModels;
-import org.drools.guvnor.client.factmodel.FieldMetaModel;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.drools.repository.model.client.RuleAsset;
+import org.drools.repository.model.client.RuleContentText;
+import org.drools.repository.model.client.factmodel.FactMetaModel;
+import org.drools.repository.model.client.factmodel.FactModels;
+import org.drools.repository.model.client.factmodel.FieldMetaModel;
+import org.drools.repository.services.internal.contenthandlers.FactModelContentHandler;
public class FactModelContentHandlerTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,22 +1,15 @@
package org.drools.guvnor.server.contenthandler;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
import junit.framework.TestCase;
-import org.drools.compiler.DroolsParserException;
-import org.drools.guvnor.client.factmodel.FactMetaModel;
-import org.drools.guvnor.client.factmodel.FactModels;
-import org.drools.guvnor.client.factmodel.FieldMetaModel;
-import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
import org.drools.guvnor.server.ServiceImplementation;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.drools.repository.services.internal.contenthandlers.ModelContentHandler;
public class ModelContentHandlerTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -20,7 +20,6 @@
import org.drools.core.util.DroolsStreamUtils;
import org.drools.core.util.FileManager;
import org.drools.definition.KnowledgePackage;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.server.ServiceImplementation;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.io.ResourceChangeScannerConfiguration;
@@ -28,6 +27,7 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.drools.repository.services.assets.AssetFormats;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/EventsTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/EventsTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/EventsTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,17 +1,17 @@
package org.drools.guvnor.server.repository;
import junit.framework.TestCase;
-import org.drools.repository.events.StorageEventManager;
-import org.drools.repository.RulesRepository;
-import org.drools.repository.PackageItem;
-import org.drools.repository.AssetItem;
-import org.drools.guvnor.client.common.AssetFormats;
+
import org.drools.guvnor.server.ServiceImplementation;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.ide.common.client.modeldriven.brl.RuleModel;
import org.drools.ide.common.client.modeldriven.dt.GuidedDecisionTable;
import org.drools.ide.common.server.util.BRXMLPersistence;
import org.drools.ide.common.server.util.GuidedDTXMLPersistence;
+import org.drools.repository.AssetItem;
+import org.drools.repository.PackageItem;
+import org.drools.repository.RulesRepository;
+import org.drools.repository.services.assets.AssetFormats;
/**
* @author Michael Neale
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RepositoryStartupServiceTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RepositoryStartupServiceTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RepositoryStartupServiceTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -22,6 +22,7 @@
import junit.framework.TestCase;
+
public class RepositoryStartupServiceTest extends TestCase {
public void testConfiguration() throws Exception {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-
-
import junit.framework.TestCase;
public class RulesRepositoryManagerTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/SampleSaveEventMock.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/SampleSaveEventMock.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/SampleSaveEventMock.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,11 +1,11 @@
package org.drools.guvnor.server.repository;
-import org.drools.repository.events.SaveEvent;
+import org.drools.ide.common.client.modeldriven.brl.RuleModel;
+import org.drools.ide.common.server.util.BRXMLPersistence;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
-import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.ide.common.client.modeldriven.brl.RuleModel;
-import org.drools.ide.common.server.util.BRXMLPersistence;
+import org.drools.repository.events.SaveEvent;
+import org.drools.repository.services.assets.AssetFormats;
/**
* @author Michael Neale
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/BuiltInSelectorTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/BuiltInSelectorTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/BuiltInSelectorTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,14 +1,15 @@
package org.drools.guvnor.server.selector;
-import org.drools.guvnor.client.rpc.RepositoryService;
+import junit.framework.TestCase;
+
import org.drools.guvnor.server.ServiceImplementation;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.CategoryItem;
import org.drools.repository.RulesRepository;
+import org.drools.repository.services.internal.selectors.BuiltInSelector;
+import org.drools.repository.services.internal.selectors.SelectorManager;
-import junit.framework.TestCase;
-
public class BuiltInSelectorTest extends TestCase {
public void testBuiltInSelector() throws Exception {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -2,6 +2,12 @@
import junit.framework.TestCase;
+import org.drools.repository.services.internal.selectors.Allow;
+import org.drools.repository.services.internal.selectors.AssetSelector;
+import org.drools.repository.services.internal.selectors.BuiltInSelector;
+import org.drools.repository.services.internal.selectors.RuleBasedSelector;
+import org.drools.repository.services.internal.selectors.SelectorManager;
+
public class SelectorManagerTest extends TestCase {
public void testSelectorMangerConfig() {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,6 +1,7 @@
package org.drools.guvnor.server.selector;
import org.drools.repository.AssetItem;
+import org.drools.repository.services.internal.selectors.AssetSelector;
public class TestSelector
implements
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -14,6 +14,7 @@
import org.drools.ide.common.client.modeldriven.brl.SingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.dt.TemplateModel;
import org.drools.ide.common.server.util.BRLPersistence;
+import org.drools.repository.services.internal.util.BRDRTPersistence;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -21,9 +21,9 @@
import junit.framework.TestCase;
-import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.guvnor.server.contenthandler.DRLFileContentHandler;
import org.drools.guvnor.server.util.ClassicDRLImporter.Asset;
+import org.drools.repository.services.assets.AssetFormats;
+import org.drools.repository.services.internal.contenthandlers.DRLFileContentHandler;
public class ClassicDRLImporterTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -27,19 +27,19 @@
import java.util.Iterator;
import java.util.List;
+import javax.jcr.Session;
+
import junit.framework.TestCase;
import org.apache.commons.fileupload.FileItem;
-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.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.drools.repository.services.assets.AssetFormats;
-import javax.jcr.Session;
-
public class FileManagerUtilsTest extends TestCase {
private Session session;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -19,7 +19,8 @@
import junit.framework.TestCase;
-import org.drools.guvnor.client.rpc.MetaData;
+import org.drools.repository.model.client.MetaData;
+import org.drools.repository.services.internal.util.MetaDataMapper;
public class MetaDataMapperTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/VerifierRunnerTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/VerifierRunnerTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/guvnor/server/util/VerifierRunnerTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -4,12 +4,12 @@
import junit.framework.Assert;
-import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.guvnor.client.rpc.AnalysisReport;
import org.drools.guvnor.server.ServiceImplementation;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.drools.repository.model.client.AnalysisReport;
+import org.drools.repository.services.assets.AssetFormats;
import org.drools.verifier.VerifierConfiguration;
import org.junit.Before;
import org.junit.Test;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/ide/common/server/rules/BRMSSuggestionCompletionLoaderTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/ide/common/server/rules/BRMSSuggestionCompletionLoaderTest.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-guvnor/src/test/java/org/drools/ide/common/server/rules/BRMSSuggestionCompletionLoaderTest.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -20,7 +20,6 @@
import junit.framework.TestCase;
-import org.drools.guvnor.client.common.AssetFormats;
import org.drools.guvnor.server.ServiceImplementation;
import org.drools.guvnor.server.util.BRMSSuggestionCompletionLoader;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
@@ -29,6 +28,7 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RulesRepository;
+import org.drools.repository.services.assets.AssetFormats;
public class BRMSSuggestionCompletionLoaderTest extends TestCase {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/.classpath
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/.classpath 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/.classpath 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,39 +1,10 @@
-<classpath>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.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/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.6.0/jackrabbit-api-1.6.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.6.0/jackrabbit-core-1.6.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.6.0/jackrabbit-jcr-commons-1.6.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.6.0/jackrabbit-spi-1.6.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.6.0/jackrabbit-spi-commons-1.6.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.6.0/jackrabbit-text-extractors-1.6.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.1/lucene-core-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.7/nekohtml-1.9.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.2-FINAL/poi-3.2-FINAL.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-scratchpad/3.2-FINAL/poi-scratchpad-3.2-FINAL.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.10/slf4j-api-1.5.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.10/slf4j-log4j12-1.5.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/.project
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/.project 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/.project 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,13 +1,23 @@
-<projectDescription>
- <name>drools-repository</name>
- <comment>A rule production system</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>drools-repository</name>
+ <comment>A rule production system</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/src/main/java/org/drools/repository/JackrabbitRepositoryConfigurator.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/src/main/java/org/drools/repository/JackrabbitRepositoryConfigurator.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/src/main/java/org/drools/repository/JackrabbitRepositoryConfigurator.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -32,18 +32,28 @@
/* (non-Javadoc)
* @see org.drools.repository.RepositoryConfigurator#getJCRRepository()
*/
- public Repository getJCRRepository(String repoRootDir) {
+ public Repository getJCRRepository() {
try {
- if (repoRootDir == null) {
return new TransientRepository();
- } else {
- return new TransientRepository(repoRootDir + "/repository.xml", repoRootDir);
- }
} catch ( IOException e ) {
throw new RulesRepositoryException("Unable to create a Repository instance.", e);
}
}
+ /* (non-Javadoc)
+ * @see org.drools.repository.RepositoryConfigurator#getJCRRepository()
+ */
+ public Repository getJCRRepository(String repoRootDir) {
+ try {
+ if (repoRootDir == null || repoRootDir.length() == 0) {
+ throw new IllegalArgumentException("repo dir is empty");
+ }
+ return new TransientRepository(repoRootDir + "/repository.xml", repoRootDir);
+ } catch ( IOException e ) {
+ throw new RulesRepositoryException("Unable to create a Repository instance.", e);
+ }
+ }
+
/* (non-Javadoc)
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -34,7 +34,7 @@
import org.slf4j.LoggerFactory;
/**
- * RulesRepository is the class that defines the bahavior for the JBoss Rules
+ * RulesRepository is the class that defines the behaviour for the JBoss Rules
* (drools) rule repository based upon the JCR specification (JSR-170).
* <p>
* An instance of this class is capable of storing rules used by the JBoss Rule
@@ -813,7 +813,7 @@
*
* @param tagName
* the name of the tag to get. If the tag to get is within a
- * heirarchy of tag nodes, specify the full path to the tag node
+ * hierarchy of tag nodes, specify the full path to the tag node
* of interest (e.g. if you want to get back 'child-tag', use
* "parent-tag/child-tag")
* @return a TagItem object encapsulating the node for the tag in the
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ElementContainerTransferNode.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ElementContainerTransferNode.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ElementContainerTransferNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,36 +0,0 @@
-package org.drools.repository.model.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.
- */
-
-public class ElementContainerTransferNode extends TransferNode {
-
- private RuleFlowContentModel contentModel;
-
- public ElementContainerTransferNode() {
- this.width = 200;
- this.height = 150;
- }
-
- public void setContentModel(RuleFlowContentModel contentModel) {
- this.contentModel = contentModel;
- }
-
- public RuleFlowContentModel getContentModel() {
- return contentModel;
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FactMetaModel.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FactMetaModel.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FactMetaModel.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,28 +0,0 @@
-package org.drools.repository.model.client;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.drools.ide.common.client.modeldriven.brl.PortableObject;
-
-/**
- * Represents the GUI data for a fact model definition.
- *
- * @author Michael Neale
- */
-public class FactMetaModel implements PortableObject {
-
- public String name;
-
- public List<FieldMetaModel> fields = new ArrayList<FieldMetaModel>();
-
- public FactMetaModel() {}
- public FactMetaModel(String name, List fields) {
- this.name = name;
- this.fields = fields;
- }
-
-
-
-}
-
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FactModels.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FactModels.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FactModels.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,14 +0,0 @@
-package org.drools.repository.model.client;
-
-import org.drools.ide.common.client.modeldriven.brl.PortableObject;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.io.Serializable;
-
-public class FactModels implements PortableObject {
-
- public List<FactMetaModel> models = new ArrayList<FactMetaModel>();
-
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FieldMetaModel.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FieldMetaModel.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FieldMetaModel.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,16 +0,0 @@
-package org.drools.repository.model.client;
-
-import org.drools.ide.common.client.modeldriven.brl.PortableObject;
-
-public class FieldMetaModel implements PortableObject {
-
- public String name;
- public String type;
-
- public FieldMetaModel() {}
- public FieldMetaModel(String name, String type) {
- this.name = name;
- this.type = type;
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/HumanTaskTransferNode.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/HumanTaskTransferNode.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/HumanTaskTransferNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,34 +0,0 @@
-package org.drools.repository.model.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.util.HashMap;
-import java.util.Map;
-
-public class HumanTaskTransferNode extends TransferNode {
-
- public Map<String, String> parameters = new HashMap<String, String>();
-
- public void setParameters(Map<String, String> parameters) {
- this.parameters = parameters;
- }
-
- public Map<String, String> getParameters() {
- return parameters;
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/PropertiesHolder.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/PropertiesHolder.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/PropertiesHolder.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,33 +0,0 @@
-package org.drools.repository.model.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.util.ArrayList;
-import java.util.List;
-
-import org.drools.ide.common.client.modeldriven.brl.PortableObject;
-
-
-/**
- * Properties representation used for RPC data exchange
- *
- * @author Anton Arhipov
- */
-public class PropertiesHolder implements PortableObject {
-
- public List<PropertyHolder> list = new ArrayList<PropertyHolder>();
-
-}
-
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/PropertyHolder.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/PropertyHolder.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/PropertyHolder.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,40 +0,0 @@
-package org.drools.repository.model.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.ide.common.client.modeldriven.brl.PortableObject;
-
-/**
- * key/value pair to be used as an exchange object for properties rule asset
- *
- * @author Anton Arhipov
- */
-public class PropertyHolder implements PortableObject {
- public String name;
- public String value;
-
- public PropertyHolder() {
- }
-
- public PropertyHolder(String name, String value) {
- this.name = name;
- this.value = value;
- }
-
- public String toString() {
- return "{" + name + "," + value + "}";
- }
-}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/RuleFlowContentModel.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/RuleFlowContentModel.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/RuleFlowContentModel.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -21,6 +21,8 @@
import java.util.List;
import org.drools.ide.common.client.modeldriven.brl.PortableObject;
+import org.drools.repository.model.client.rulefloweditor.TransferConnection;
+import org.drools.repository.model.client.rulefloweditor.TransferNode;
public class RuleFlowContentModel implements PortableObject {
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/SplitTransferNode.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/SplitTransferNode.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/SplitTransferNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,70 +0,0 @@
-package org.drools.repository.model.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.util.HashMap;
-import java.util.Map;
-
-public class SplitTransferNode extends TransferNode {
-
- private Map<SplitConnectionRef, SplitConstraint> constraints = new HashMap<SplitConnectionRef, SplitConstraint>();
- private Type splitType;
-
- public enum Type {
- UNDEFINED(0), AND(1), XOR(2), OR(3);
-
- private final int value;
-
- Type(int i) {
- value = i;
- }
-
- int getValue() {
- return value;
- }
-
- public static Type getType(int i) {
- switch (i) {
- case 0:
- return Type.UNDEFINED;
- case 1:
- return Type.AND;
- case 2:
- return Type.XOR;
- case 3:
- default:
- return Type.OR;
- }
- }
- }
-
- public void setConstraints(Map<SplitConnectionRef, SplitConstraint> constraints) {
- this.constraints = constraints;
- }
-
- public Map<SplitConnectionRef, SplitConstraint> getConstraints() {
- return constraints;
- }
-
- public void setSplitType(Type splitType) {
- this.splitType = splitType;
- }
-
- public Type getSplitType() {
- return splitType;
- }
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/TransferConnection.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/TransferConnection.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/TransferConnection.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,42 +0,0 @@
-package org.drools.repository.model.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.io.Serializable;
-
-public class TransferConnection implements Serializable {
-
- private long fromId;
- private long toId;
-
- public void setFromId(long fromId) {
- this.fromId = fromId;
- }
-
- public long getFromId() {
- return fromId;
- }
-
- public void setToId(long toId) {
- this.toId = toId;
- }
-
- public long getToId() {
- return toId;
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/TransferNode.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/TransferNode.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/TransferNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,97 +0,0 @@
-package org.drools.repository.model.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.io.Serializable;
-
-public class TransferNode implements Serializable {
-
- public static enum Type {
- START, HUMANTASK, JOIN, SUB_PROCESS, MILESTONE, TIMER, ACTION_NODE, RULESET, SPLIT, END, FOR_EACH, COMPOSITE, EVENT, WORK_ITEM, FAULT
- }
-
- private String name;
-
- private Type type;
-
- private long id;
-
- private int x;
-
- private int y;
-
- protected int width = 80;
-
- protected int height = 40;
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public void setType(Type type) {
- this.type = type;
- }
-
- public Type getType() {
- return type;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public long getId() {
- return id;
- }
-
- public void setX(int x) {
- this.x = x;
- }
-
- public int getX() {
- return x;
- }
-
- public void setY(int y) {
- this.y = y;
- }
-
- public int getY() {
- return y;
- }
-
- public void setWidth(int width) {
- this.width = width;
- }
-
- public int getWidth() {
- return width;
- }
-
- public void setHeight(int height) {
- this.height = height;
- }
-
- public int getHeight() {
- return height;
- }
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/WorkItemTransferNode.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/WorkItemTransferNode.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/WorkItemTransferNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,42 +0,0 @@
-package org.drools.repository.model.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.util.HashMap;
-import java.util.Map;
-
-public class WorkItemTransferNode extends TransferNode {
-
- public Map<String, String> parameters = new HashMap<String, String>();
- public String workName;
-
- public void setParameters(Map<String, String> parameters) {
- this.parameters = parameters;
- }
-
- public Map<String, String> getParameters() {
- return parameters;
- }
-
- public void setWorkName(String workName) {
- this.workName = workName;
- }
-
- public String getWorkName() {
- return workName;
- }
-}
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FactMetaModel.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FactMetaModel.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FactMetaModel.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FactMetaModel.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,28 @@
+package org.drools.repository.model.client.factmodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.ide.common.client.modeldriven.brl.PortableObject;
+
+/**
+ * Represents the GUI data for a fact model definition.
+ *
+ * @author Michael Neale
+ */
+public class FactMetaModel implements PortableObject {
+
+ public String name;
+
+ public List<FieldMetaModel> fields = new ArrayList<FieldMetaModel>();
+
+ public FactMetaModel() {}
+ public FactMetaModel(String name, List fields) {
+ this.name = name;
+ this.fields = fields;
+ }
+
+
+
+}
+
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FactModels.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FactModels.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FactModels.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FactModels.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,14 @@
+package org.drools.repository.model.client.factmodel;
+
+import org.drools.ide.common.client.modeldriven.brl.PortableObject;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.io.Serializable;
+
+public class FactModels implements PortableObject {
+
+ public List<FactMetaModel> models = new ArrayList<FactMetaModel>();
+
+
+}
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FieldMetaModel.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/FieldMetaModel.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FieldMetaModel.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/factmodel/FieldMetaModel.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,16 @@
+package org.drools.repository.model.client.factmodel;
+
+import org.drools.ide.common.client.modeldriven.brl.PortableObject;
+
+public class FieldMetaModel implements PortableObject {
+
+ public String name;
+ public String type;
+
+ public FieldMetaModel() {}
+ public FieldMetaModel(String name, String type) {
+ this.name = name;
+ this.type = type;
+ }
+
+}
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ruleeditor/PropertiesHolder.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/PropertiesHolder.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ruleeditor/PropertiesHolder.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ruleeditor/PropertiesHolder.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,33 @@
+package org.drools.repository.model.client.ruleeditor;
+/*
+ * 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.ArrayList;
+import java.util.List;
+
+import org.drools.ide.common.client.modeldriven.brl.PortableObject;
+
+
+/**
+ * Properties representation used for RPC data exchange
+ *
+ * @author Anton Arhipov
+ */
+public class PropertiesHolder implements PortableObject {
+
+ public List<PropertyHolder> list = new ArrayList<PropertyHolder>();
+
+}
+
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ruleeditor/PropertyHolder.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/PropertyHolder.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ruleeditor/PropertyHolder.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ruleeditor/PropertyHolder.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,40 @@
+package org.drools.repository.model.client.ruleeditor;
+/*
+ * 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.ide.common.client.modeldriven.brl.PortableObject;
+
+/**
+ * key/value pair to be used as an exchange object for properties rule asset
+ *
+ * @author Anton Arhipov
+ */
+public class PropertyHolder implements PortableObject {
+ public String name;
+ public String value;
+
+ public PropertyHolder() {
+ }
+
+ public PropertyHolder(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+
+ public String toString() {
+ return "{" + name + "," + value + "}";
+ }
+}
\ No newline at end of file
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/ElementContainerTransferNode.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/ElementContainerTransferNode.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/ElementContainerTransferNode.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/ElementContainerTransferNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,38 @@
+package org.drools.repository.model.client.rulefloweditor;
+
+import org.drools.repository.model.client.RuleFlowContentModel;
+
+/*
+ * 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.
+ */
+
+public class ElementContainerTransferNode extends TransferNode {
+
+ private RuleFlowContentModel contentModel;
+
+ public ElementContainerTransferNode() {
+ this.width = 200;
+ this.height = 150;
+ }
+
+ public void setContentModel(RuleFlowContentModel contentModel) {
+ this.contentModel = contentModel;
+ }
+
+ public RuleFlowContentModel getContentModel() {
+ return contentModel;
+ }
+
+}
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/HumanTaskTransferNode.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/HumanTaskTransferNode.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/HumanTaskTransferNode.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/HumanTaskTransferNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,35 @@
+package org.drools.repository.model.client.rulefloweditor;
+
+/*
+ * 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;
+
+
+public class HumanTaskTransferNode extends TransferNode {
+
+ public Map<String, String> parameters = new HashMap<String, String>();
+
+ public void setParameters(Map<String, String> parameters) {
+ this.parameters = parameters;
+ }
+
+ public Map<String, String> getParameters() {
+ return parameters;
+ }
+
+}
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/SplitTransferNode.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/SplitTransferNode.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/SplitTransferNode.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/SplitTransferNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,73 @@
+package org.drools.repository.model.client.rulefloweditor;
+
+/*
+ * 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;
+
+import org.drools.repository.model.client.SplitConnectionRef;
+import org.drools.repository.model.client.SplitConstraint;
+
+public class SplitTransferNode extends TransferNode {
+
+ private Map<SplitConnectionRef, SplitConstraint> constraints = new HashMap<SplitConnectionRef, SplitConstraint>();
+ private Type splitType;
+
+ public enum Type {
+ UNDEFINED(0), AND(1), XOR(2), OR(3);
+
+ private final int value;
+
+ Type(int i) {
+ value = i;
+ }
+
+ int getValue() {
+ return value;
+ }
+
+ public static Type getType(int i) {
+ switch (i) {
+ case 0:
+ return Type.UNDEFINED;
+ case 1:
+ return Type.AND;
+ case 2:
+ return Type.XOR;
+ case 3:
+ default:
+ return Type.OR;
+ }
+ }
+ }
+
+ public void setConstraints(Map<SplitConnectionRef, SplitConstraint> constraints) {
+ this.constraints = constraints;
+ }
+
+ public Map<SplitConnectionRef, SplitConstraint> getConstraints() {
+ return constraints;
+ }
+
+ public void setSplitType(Type splitType) {
+ this.splitType = splitType;
+ }
+
+ public Type getSplitType() {
+ return splitType;
+ }
+}
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/TransferConnection.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/TransferConnection.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/TransferConnection.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/TransferConnection.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,42 @@
+package org.drools.repository.model.client.rulefloweditor;
+
+/*
+ * 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.Serializable;
+
+public class TransferConnection implements Serializable {
+
+ private long fromId;
+ private long toId;
+
+ public void setFromId(long fromId) {
+ this.fromId = fromId;
+ }
+
+ public long getFromId() {
+ return fromId;
+ }
+
+ public void setToId(long toId) {
+ this.toId = toId;
+ }
+
+ public long getToId() {
+ return toId;
+ }
+
+}
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/TransferNode.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/TransferNode.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/TransferNode.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/TransferNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,97 @@
+package org.drools.repository.model.client.rulefloweditor;
+
+/*
+ * 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.Serializable;
+
+public class TransferNode implements Serializable {
+
+ public static enum Type {
+ START, HUMANTASK, JOIN, SUB_PROCESS, MILESTONE, TIMER, ACTION_NODE, RULESET, SPLIT, END, FOR_EACH, COMPOSITE, EVENT, WORK_ITEM, FAULT
+ }
+
+ private String name;
+
+ private Type type;
+
+ private long id;
+
+ private int x;
+
+ private int y;
+
+ public int width = 80;
+
+ public int height = 40;
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setType(Type type) {
+ this.type = type;
+ }
+
+ public Type getType() {
+ return type;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public void setX(int x) {
+ this.x = x;
+ }
+
+ public int getX() {
+ return x;
+ }
+
+ public void setY(int y) {
+ this.y = y;
+ }
+
+ public int getY() {
+ return y;
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+}
Copied: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/WorkItemTransferNode.java (from rev 32821, labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/WorkItemTransferNode.java)
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/WorkItemTransferNode.java (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-model/src/main/java/org/drools/repository/model/client/rulefloweditor/WorkItemTransferNode.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -0,0 +1,42 @@
+package org.drools.repository.model.client.rulefloweditor;
+
+/*
+ * 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;
+
+public class WorkItemTransferNode extends TransferNode {
+
+ public Map<String, String> parameters = new HashMap<String, String>();
+ public String workName;
+
+ public void setParameters(Map<String, String> parameters) {
+ this.parameters = parameters;
+ }
+
+ public Map<String, String> getParameters() {
+ return parameters;
+ }
+
+ public void setWorkName(String workName) {
+ this.workName = workName;
+ }
+
+ public String getWorkName() {
+ return workName;
+ }
+}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/RepositoryService.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/RepositoryService.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/RepositoryService.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,5 +0,0 @@
-package org.drools.repository.services;
-
-public interface RepositoryService {
-
-}
Deleted: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryServicesImpl.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryServicesImpl.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryServicesImpl.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -1,7 +0,0 @@
-package org.drools.repository.services.internal;
-
-import org.drools.repository.services.RepositoryService;
-
-public class RepositoryServicesImpl implements RepositoryService {
-
-}
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryStartupService.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryStartupService.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryStartupService.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
@@ -39,6 +38,10 @@
private Repository repository;
private String repositoryHomeDirectory = "/tmp";
+ public RepositoryStartupService() {
+ //FIXME!!!! {bauna diega} we need to remove
+ }
+
@Inject
public RepositoryStartupService(JCRRepositoryConfigurator configurator) {
this.configurator = configurator;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/ContentPackageAssembler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/ContentPackageAssembler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -64,7 +64,7 @@
*/
private List<ContentAssemblyError> errors = new ArrayList<ContentAssemblyError>();
- BRMSPackageBuilder builder;
+ public BRMSPackageBuilder builder;
private String customSelectorName;
private String buildMode;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/RuleFlowContentModelBuilder.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/RuleFlowContentModelBuilder.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/RuleFlowContentModelBuilder.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -7,15 +7,15 @@
import org.drools.definition.process.Connection;
import org.drools.definition.process.Node;
import org.drools.process.core.Work;
-import org.drools.repository.model.client.ElementContainerTransferNode;
-import org.drools.repository.model.client.HumanTaskTransferNode;
import org.drools.repository.model.client.RuleFlowContentModel;
import org.drools.repository.model.client.SplitConnectionRef;
import org.drools.repository.model.client.SplitConstraint;
-import org.drools.repository.model.client.SplitTransferNode;
-import org.drools.repository.model.client.TransferConnection;
-import org.drools.repository.model.client.TransferNode;
-import org.drools.repository.model.client.WorkItemTransferNode;
+import org.drools.repository.model.client.rulefloweditor.ElementContainerTransferNode;
+import org.drools.repository.model.client.rulefloweditor.HumanTaskTransferNode;
+import org.drools.repository.model.client.rulefloweditor.SplitTransferNode;
+import org.drools.repository.model.client.rulefloweditor.TransferConnection;
+import org.drools.repository.model.client.rulefloweditor.TransferNode;
+import org.drools.repository.model.client.rulefloweditor.WorkItemTransferNode;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.workflow.core.Constraint;
import org.drools.workflow.core.impl.ConnectionRef;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/RuleFlowProcessBuilder.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/RuleFlowProcessBuilder.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/builder/RuleFlowProcessBuilder.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -20,14 +20,14 @@
import org.drools.definition.process.Node;
import org.drools.process.core.Work;
-import org.drools.repository.model.client.ElementContainerTransferNode;
-import org.drools.repository.model.client.HumanTaskTransferNode;
import org.drools.repository.model.client.SplitConnectionRef;
import org.drools.repository.model.client.SplitConstraint;
-import org.drools.repository.model.client.SplitTransferNode;
-import org.drools.repository.model.client.TransferNode;
-import org.drools.repository.model.client.WorkItemTransferNode;
-import org.drools.repository.model.client.TransferNode.Type;
+import org.drools.repository.model.client.rulefloweditor.ElementContainerTransferNode;
+import org.drools.repository.model.client.rulefloweditor.HumanTaskTransferNode;
+import org.drools.repository.model.client.rulefloweditor.SplitTransferNode;
+import org.drools.repository.model.client.rulefloweditor.TransferNode;
+import org.drools.repository.model.client.rulefloweditor.WorkItemTransferNode;
+import org.drools.repository.model.client.rulefloweditor.TransferNode.Type;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.workflow.core.Constraint;
import org.drools.workflow.core.impl.ConnectionRef;
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/DRLFileContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/DRLFileContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/DRLFileContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -39,7 +39,8 @@
}
}
- String wrapRuleDeclaration(String name,
+ //TODO do something to make private and testable
+ public String wrapRuleDeclaration(String name,
String parentName,
String content) {
if ( parentName == null || "".equals( parentName ) ) {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/FactModelContentHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/FactModelContentHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/FactModelContentHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -12,12 +12,12 @@
import org.drools.lang.descr.TypeFieldDescr;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
-import org.drools.repository.model.client.FactMetaModel;
-import org.drools.repository.model.client.FactModels;
-import org.drools.repository.model.client.FieldMetaModel;
import org.drools.repository.model.client.RuleAsset;
import org.drools.repository.model.client.RuleContentText;
import org.drools.repository.model.client.exceptions.SerializableException;
+import org.drools.repository.model.client.factmodel.FactMetaModel;
+import org.drools.repository.model.client.factmodel.FactModels;
+import org.drools.repository.model.client.factmodel.FieldMetaModel;
public class FactModelContentHandler extends ContentHandler {
@@ -51,8 +51,8 @@
}
-
- String toDRL(FactMetaModel mm) {
+ //TODO so something to make private and testable
+ public String toDRL(FactMetaModel mm) {
StringBuilder sb = new StringBuilder();
sb.append("declare " + mm.name);
for (int i = 0; i < mm.fields.size(); i++) {
@@ -64,7 +64,7 @@
return sb.toString();
}
- List<FactMetaModel> toModel(String drl) throws DroolsParserException {
+ public List<FactMetaModel> toModel(String drl) throws DroolsParserException {
if (drl != null && drl.startsWith("#advanced")) {
throw new DroolsParserException("Using advanced editor");
}
@@ -104,7 +104,8 @@
return list;
}
- String toDRL(List<FactMetaModel> models) {
+ //TODO do something to make private and testable
+ public String toDRL(List<FactMetaModel> models) {
StringBuilder sb = new StringBuilder();
for (FactMetaModel factMetaModel : models) {
String drl = toDRL(factMetaModel);
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/PropertiesHandler.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/PropertiesHandler.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/contenthandlers/PropertiesHandler.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -23,9 +23,9 @@
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
-import org.drools.repository.model.client.PropertiesHolder;
import org.drools.repository.model.client.RuleAsset;
import org.drools.repository.model.client.exceptions.SerializableException;
+import org.drools.repository.model.client.ruleeditor.PropertiesHolder;
import org.drools.repository.services.internal.util.PropertiesPersistence;
/**
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/selectors/RuleBasedSelector.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/selectors/RuleBasedSelector.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/selectors/RuleBasedSelector.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -25,7 +25,7 @@
private static final Logger log = LoggerFactory.getLogger( RuleBasedSelector.class );
- String ruleFile;
+ public String ruleFile;
private RuleBase ruleBase;
public RuleBasedSelector(String val) {
@@ -51,7 +51,7 @@
return evalRules( asset );
}
- boolean evalRules(Object asset) {
+ public boolean evalRules(Object asset) {
StatelessSession session = ruleBase.newStatelessSession();
StatelessSessionResult result = session.executeWithResults( asset );
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/selectors/SelectorManager.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/selectors/SelectorManager.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/selectors/SelectorManager.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -25,7 +25,7 @@
*/
public final Map<String, AssetSelector> selectors = new HashMap<String, AssetSelector>();
- SelectorManager(String configPath) {
+ public SelectorManager(String configPath) {
log.debug("Loading selectors");
Properties props = new Properties();
try {
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/util/PropertiesPersistence.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/util/PropertiesPersistence.java 2010-05-11 18:51:35 UTC (rev 32831)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/util/PropertiesPersistence.java 2010-05-11 20:34:36 UTC (rev 32832)
@@ -18,8 +18,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.repository.model.client.PropertiesHolder;
-import org.drools.repository.model.client.PropertyHolder;
+import org.drools.repository.model.client.ruleeditor.PropertiesHolder;
+import org.drools.repository.model.client.ruleeditor.PropertyHolder;
/**
* used to convert PropertiesHolder to text and back
More information about the jboss-svn-commits
mailing list