[jboss-svn-commits] JBL Code SVN: r23651 - in labs/jbossrules/trunk: drools-clips/src/main/java/org/drools/clips/functions and 64 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Oct 31 10:35:04 EDT 2008


Author: tirelli
Date: 2008-10-31 10:35:03 -0400 (Fri, 31 Oct 2008)
New Revision: 23651

Modified:
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsLexer.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsParser.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/FunctionContext.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/PrintRouterContext.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/AssertFunction.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/GetFunction.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RetractFunction.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RunFunction.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialect.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialectConfiguration.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsEvalBuilder.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsPredicateBuilder.java
   labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsReturnValueBuilder.java
   labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clips/CompiledFunctionsTest.java
   labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clips/LhsClpParserTest.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/MethodExecutor.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/WebDavServletBean.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/WebdavStore.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/AbstractMethod.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoCopy.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoDelete.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoGet.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoHead.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoMkcol.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoMove.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoOptions.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/ReportingMethod.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoginWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryExplorerWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/LoadingPopup.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/RulePackageSelector.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionInsertColumn.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationPanel.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/CategoriesPanel.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/DeploymentPanel.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/GenericPanel.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/QAPanel.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/RulesNewMenu.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionCallMethodWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/AssetAttachmentFileWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioHelper.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/XmlFileWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowViewer.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/TransferRuleFlowNodeFactory.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/XmlFileHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermissionManager.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/PropertiesPersistence.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/CollectionsTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/HumanReadableTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/ScenarioHelperTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/DeploymentURIHelperTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/WebDAVImplTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/BRMSRepositoryConfigurationTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/rules/BRMSSuggestionCompletionLoaderTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockIdentity.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockRoleBasedPermissionStore.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/NilAuthenticatorTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/client/MinaKnowledgeBaseClient.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/eventmessaging/EventKeys.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Attachment.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/BooleanExpression.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Comment.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadline.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadlines.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Delegation.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/EmailNotification.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Escalation.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Group.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/I18NText.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Notification.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/OrganizationalEntity.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Reassignment.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Task.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskData.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/WorkItemNotification.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/query/TaskSummary.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaHandler.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaServer.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/DefaultEscalatedDeadlineHandler.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientHandler.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskOperation.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/utils/CollectionUtils.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/BaseTest.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/ModelPersistenceTest.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/QueryTest.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/RunTaskService.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/AbstractBlockingResponseHandler.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingDeleteAttachmentResponseHandler.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingDeleteCommentResponseHandler.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingTaskOperationResponseHandler.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/DemoTaskService.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsTest.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/userprofile/MockIdentity.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/userprofile/UserProfileManagerTest.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/PackageDescrFlattener.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/RuleSolver.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Solver.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Solvers.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierData.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierDataMaps.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierResult.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierResultNormal.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/ReportModeller.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ComponentsReportVisitor.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/MissingRangesReportVisitor.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportModeller.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportVisitor.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/VerifierMessagesVisitor.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/ConsequenceTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/FindMissingNumberTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/PatternSolverTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/RangeCheckCleanTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/SolversTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/SubsumptantPossibilitiesRuleTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/TestBase.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/VerifierTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/incoherence/IncoherentPatternsTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/incoherence/IncoherentRestrictionsTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/missingEquality/MissingEqualityTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/optimisation/PatternOrderTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/optimisation/RestrictionOrderTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/overlaps/OverlappingRestrictionsTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/NotesTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/RedundantPossibilitiesTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/RedundantRulesAndPatternsTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/WarningsTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/subsumption/SubsumptantPossibilitiesTest.java
Log:
Upgrading to mvel2. Fixing Enabled expression

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsLexer.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsLexer.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsLexer.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -3,12 +3,16 @@
 	package org.drools.clips;
 
 
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
 import java.util.HashMap;
+
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.Lexer;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
 public class ClipsLexer extends Lexer {
     public static final int RIGHT_SQUARE=39;
     public static final int RIGHT_CURLY=41;

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsParser.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsParser.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsParser.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,25 +2,50 @@
 
 	package org.drools.clips;
 
-    import org.drools.clips.*;		
-    
-	import java.util.List;
-	import java.util.ArrayList;
-	import java.util.Iterator;
-	import java.util.HashMap;	
-	import java.util.Set;	
-	import java.util.HashSet;			
-	import java.util.StringTokenizer;
-	import org.drools.lang.descr.*;
-	import org.drools.lang.Location;	
+    import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.FailedPredicateException;
+import org.antlr.runtime.MismatchedNotSetException;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.MismatchedTokenException;
+import org.antlr.runtime.MismatchedTreeNodeException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.Parser;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.drools.lang.Location;
+import org.drools.lang.descr.AndDescr;
+import org.drools.lang.descr.AttributeDescr;
+import org.drools.lang.descr.ConditionalElementDescr;
+import org.drools.lang.descr.DescrFactory;
+import org.drools.lang.descr.EvalDescr;
+import org.drools.lang.descr.ExistsDescr;
+import org.drools.lang.descr.FieldBindingDescr;
+import org.drools.lang.descr.FieldConstraintDescr;
+import org.drools.lang.descr.FunctionDescr;
+import org.drools.lang.descr.ImportDescr;
+import org.drools.lang.descr.LiteralRestrictionDescr;
+import org.drools.lang.descr.NotDescr;
+import org.drools.lang.descr.OrDescr;
+import org.drools.lang.descr.PackageDescr;
+import org.drools.lang.descr.PatternDescr;
+import org.drools.lang.descr.PredicateDescr;
+import org.drools.lang.descr.RestrictionConnectiveDescr;
+import org.drools.lang.descr.RestrictionDescr;
+import org.drools.lang.descr.ReturnValueRestrictionDescr;
+import org.drools.lang.descr.RuleDescr;
+import org.drools.lang.descr.TypeDeclarationDescr;
+import org.drools.lang.descr.TypeFieldDescr;
+import org.drools.lang.descr.VariableRestrictionDescr;
 public class ClipsParser extends Parser {
     public static final String[] tokenNames = new String[] {
         "<invalid>", "<EOR>", "<DOWN>", "<UP>", "LEFT_PAREN", "NAME", "RIGHT_PAREN", "DEFFUNCTION", "DEFRULE", "STRING", "SALIENCE", "INT", "AND", "OR", "NOT", "EXISTS", "TEST", "VAR", "ASSIGN_OP", "PIPE", "AMPERSAND", "TILDE", "COLON", "EQUALS", "FLOAT", "BOOL", "NULL", "DEFTEMPLATE", "EOL", "WS", "DECLARE", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SYMBOL_CHAR", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "LEFT_SQUARE", "RIGHT_SQUARE", "LEFT_CURLY", "RIGHT_CURLY", "MULTI_LINE_COMMENT", "SYMBOL", "FIRST_SYMBOL_CHAR", "'import'", "'=>'"

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -65,10 +65,9 @@
 import org.drools.rule.Package;
 import org.drools.runtime.rule.FactHandle;
 import org.drools.spi.GlobalResolver;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.ast.Function;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.MVEL;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
 
 /**
  * An interactive Clips session shell.
@@ -504,7 +503,7 @@
     }
 
     public void addFunction(Function function) {
-        this.factory.createVariable( function.getAbsoluteName(),
+        this.factory.createVariable( function.getName(),
                                      function );
     }
 

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/FunctionContext.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/FunctionContext.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/FunctionContext.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,8 +2,6 @@
 
 import java.util.Map;
 
-import org.mvel.ast.Function;
-
 public interface FunctionContext {
 
     public abstract void addFunction(Function function);

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/PrintRouterContext.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/PrintRouterContext.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/PrintRouterContext.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,10 +1,7 @@
 package org.drools.clips;
 
 import java.io.PrintStream;
-import java.util.Map;
 
-import org.mvel.ast.Function;
-
 public interface PrintRouterContext {
 
     public abstract void addRouter(String name, PrintStream out);

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/AssertFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/AssertFunction.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/AssertFunction.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -5,7 +5,6 @@
 import org.drools.clips.FunctionHandlers;
 import org.drools.clips.LispAtom;
 import org.drools.clips.LispForm;
-import org.drools.clips.SExpression;
 
 public class AssertFunction implements Function {
     private static final String name = "assert";

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/GetFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/GetFunction.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/GetFunction.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,7 +2,6 @@
 
 import org.drools.clips.Appendable;
 import org.drools.clips.Function;
-import org.drools.clips.FunctionHandlers;
 import org.drools.clips.LispAtom;
 import org.drools.clips.LispForm;
 import org.drools.clips.SExpression;

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RetractFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RetractFunction.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RetractFunction.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,10 +2,8 @@
 
 import org.drools.clips.Appendable;
 import org.drools.clips.Function;
-import org.drools.clips.FunctionHandlers;
 import org.drools.clips.LispAtom;
 import org.drools.clips.LispForm;
-import org.drools.clips.SExpression;
 
 public class RetractFunction implements Function {
     private static final String name = "retract";

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RunFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RunFunction.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RunFunction.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,7 +2,6 @@
 
 import org.drools.clips.Appendable;
 import org.drools.clips.Function;
-import org.drools.clips.FunctionHandlers;
 import org.drools.clips.LispAtom;
 import org.drools.clips.LispForm;
 

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialect.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialect.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,9 +1,6 @@
 package org.drools.rule.builder.dialect.clips;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -11,12 +8,9 @@
 import org.drools.clips.FunctionHandlers;
 import org.drools.clips.LispForm;
 import org.drools.clips.StringBuilderAppendable;
-import org.drools.commons.jci.readers.MemoryResourceReader;
-import org.drools.compiler.DescrBuildError;
 import org.drools.compiler.Dialect;
 import org.drools.compiler.PackageBuilder;
 import org.drools.compiler.PackageRegistry;
-import org.drools.compiler.ReturnValueDescr;
 import org.drools.lang.descr.AccumulateDescr;
 import org.drools.lang.descr.AndDescr;
 import org.drools.lang.descr.BaseDescr;
@@ -40,7 +34,6 @@
 import org.drools.rule.builder.ReturnValueBuilder;
 import org.drools.rule.builder.RuleConditionBuilder;
 import org.drools.rule.builder.dialect.mvel.MVELDialect;
-import org.drools.rule.builder.dialect.mvel.MVELDialectConfiguration;
 
 public class ClipsDialect extends MVELDialect {
 

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialectConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialectConfiguration.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialectConfiguration.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,12 +1,9 @@
 package org.drools.rule.builder.dialect.clips;
 
 import org.drools.compiler.Dialect;
-import org.drools.compiler.DialectConfiguration;
 import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.PackageBuilderConfiguration;
 import org.drools.compiler.PackageRegistry;
 import org.drools.rule.Package;
-import org.drools.rule.builder.dialect.mvel.MVELDialect;
 import org.drools.rule.builder.dialect.mvel.MVELDialectConfiguration;
 
 /**

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsEvalBuilder.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsEvalBuilder.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -16,37 +16,17 @@
 
 package org.drools.rule.builder.dialect.clips;
 
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.drools.base.mvel.DroolsMVELFactory;
-import org.drools.base.mvel.MVELEvalExpression;
 import org.drools.clips.Appendable;
 import org.drools.clips.FunctionHandlers;
 import org.drools.clips.LispForm;
 import org.drools.clips.StringBuilderAppendable;
-import org.drools.compiler.Dialect;
-import org.drools.compiler.DescrBuildError;
 import org.drools.lang.descr.BaseDescr;
 import org.drools.lang.descr.EvalDescr;
-import org.drools.lang.descr.PredicateDescr;
-import org.drools.rule.Declaration;
-import org.drools.rule.EvalCondition;
-import org.drools.rule.MVELDialectRuntimeData;
 import org.drools.rule.Pattern;
 import org.drools.rule.RuleConditionElement;
 import org.drools.rule.builder.RuleBuildContext;
 import org.drools.rule.builder.RuleConditionBuilder;
 import org.drools.rule.builder.dialect.mvel.MVELEvalBuilder;
-import org.drools.spi.DeclarationScopeResolver;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.util.ParseTools;
 
 /**
  * @author etirelli

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsPredicateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsPredicateBuilder.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsPredicateBuilder.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -16,32 +16,14 @@
 
 package org.drools.rule.builder.dialect.clips;
 
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
-import org.drools.base.mvel.DroolsMVELFactory;
-import org.drools.base.mvel.MVELPredicateExpression;
-import org.drools.clips.Appendable;
-import org.drools.clips.FunctionHandlers;
-import org.drools.clips.LispForm;
-import org.drools.clips.StringBuilderAppendable;
-import org.drools.compiler.Dialect;
-import org.drools.compiler.DescrBuildError;
 import org.drools.lang.descr.PredicateDescr;
 import org.drools.rule.Declaration;
-import org.drools.rule.MVELDialectRuntimeData;
 import org.drools.rule.PredicateConstraint;
 import org.drools.rule.builder.PredicateBuilder;
 import org.drools.rule.builder.RuleBuildContext;
 import org.drools.rule.builder.dialect.mvel.MVELPredicateBuilder;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
 
 /**
  * @author etirelli

Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsReturnValueBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsReturnValueBuilder.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsReturnValueBuilder.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,12 +1,7 @@
 package org.drools.rule.builder.dialect.clips;
 
-import java.util.Iterator;
 import java.util.List;
 
-import org.drools.clips.Appendable;
-import org.drools.clips.FunctionHandlers;
-import org.drools.clips.LispForm;
-import org.drools.clips.StringBuilderAppendable;
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
 import org.drools.rule.Declaration;
 import org.drools.rule.ReturnValueRestriction;

Modified: labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clips/CompiledFunctionsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clips/CompiledFunctionsTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clips/CompiledFunctionsTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,23 +1,6 @@
 package org.drools.clips;
 
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
 
-import junit.framework.TestCase;
-
-import org.antlr.runtime.ANTLRStringStream;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.Lexer;
-import org.antlr.runtime.TokenStream;
-import org.drools.Person;
-
 public class CompiledFunctionsTest { //extends TestCase {
 //    private CLPParser parser;
 //

Modified: labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clips/LhsClpParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clips/LhsClpParserTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clips/LhsClpParserTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -24,7 +24,6 @@
 import org.drools.lang.descr.RestrictionConnectiveDescr;
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
 import org.drools.lang.descr.RuleDescr;
-import org.drools.reteoo.builder.BuildContext;
 
 public class LhsClpParserTest extends TestCase {
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/MethodExecutor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/MethodExecutor.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/MethodExecutor.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,9 +15,10 @@
  */
 package net.sf.webdav;
 
+import java.io.IOException;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 public interface MethodExecutor {
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/WebDavServletBean.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/WebDavServletBean.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/WebDavServletBean.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,30 +1,30 @@
 package net.sf.webdav;
 
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Enumeration;
+import java.util.HashMap;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import net.sf.webdav.exceptions.UnauthenticatedException;
 import net.sf.webdav.exceptions.WebdavException;
-import net.sf.webdav.fromcatalina.MD5Encoder;
 import net.sf.webdav.methods.DoCopy;
 import net.sf.webdav.methods.DoDelete;
 import net.sf.webdav.methods.DoGet;
+import net.sf.webdav.methods.DoHead;
 import net.sf.webdav.methods.DoLock;
 import net.sf.webdav.methods.DoMkcol;
 import net.sf.webdav.methods.DoMove;
+import net.sf.webdav.methods.DoNotImplemented;
 import net.sf.webdav.methods.DoOptions;
 import net.sf.webdav.methods.DoPropfind;
 import net.sf.webdav.methods.DoPut;
-import net.sf.webdav.methods.DoHead;
-import net.sf.webdav.methods.DoNotImplemented;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Enumeration;
-import java.util.HashMap;
-
 public class WebDavServletBean extends HttpServlet {
 
     private static org.slf4j.Logger log = org.slf4j.LoggerFactory

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/WebdavStore.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/WebdavStore.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/WebdavStore.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -23,12 +23,12 @@
 
 package net.sf.webdav;
 
-import net.sf.webdav.exceptions.WebdavException;
-
 import java.io.InputStream;
 import java.security.Principal;
 import java.util.Date;
 
+import net.sf.webdav.exceptions.WebdavException;
+
 /**
  * Interface for simple implementation of any store for the WebdavServlet
  * <p>

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/AbstractMethod.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/AbstractMethod.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/AbstractMethod.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -16,10 +16,10 @@
 
 package net.sf.webdav.methods;
 
+import javax.servlet.http.HttpServletRequest;
+
 import net.sf.webdav.MethodExecutor;
 
-import javax.servlet.http.HttpServletRequest;
-
 public abstract class AbstractMethod implements MethodExecutor {
 
     /**

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoCopy.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoCopy.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoCopy.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,20 +15,21 @@
  */
 package net.sf.webdav.methods;
 
+import java.io.IOException;
+import java.util.Hashtable;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.webdav.ResourceLocks;
+import net.sf.webdav.WebdavStatus;
+import net.sf.webdav.WebdavStore;
 import net.sf.webdav.exceptions.AccessDeniedException;
 import net.sf.webdav.exceptions.ObjectAlreadyExistsException;
 import net.sf.webdav.exceptions.ObjectNotFoundException;
 import net.sf.webdav.exceptions.WebdavException;
-import net.sf.webdav.WebdavStatus;
-import net.sf.webdav.WebdavStore;
-import net.sf.webdav.ResourceLocks;
 import net.sf.webdav.fromcatalina.RequestUtil;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Hashtable;
-
 public class DoCopy extends ReportingMethod {
 
     private static org.slf4j.Logger log = org.slf4j.LoggerFactory

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoDelete.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoDelete.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoDelete.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,19 +15,20 @@
  */
 package net.sf.webdav.methods;
 
+import java.io.IOException;
+import java.util.Hashtable;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.webdav.ResourceLocks;
+import net.sf.webdav.WebdavStatus;
+import net.sf.webdav.WebdavStore;
 import net.sf.webdav.exceptions.AccessDeniedException;
 import net.sf.webdav.exceptions.ObjectAlreadyExistsException;
+import net.sf.webdav.exceptions.ObjectNotFoundException;
 import net.sf.webdav.exceptions.WebdavException;
-import net.sf.webdav.exceptions.ObjectNotFoundException;
-import net.sf.webdav.WebdavStatus;
-import net.sf.webdav.ResourceLocks;
-import net.sf.webdav.WebdavStore;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Hashtable;
-import java.io.IOException;
-
 public class DoDelete extends ReportingMethod {
 
     private static org.slf4j.Logger log = org.slf4j.LoggerFactory

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoGet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoGet.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoGet.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,16 +15,17 @@
  */
 package net.sf.webdav.methods;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import net.sf.webdav.MimeTyper;
 import net.sf.webdav.ResourceLocks;
 import net.sf.webdav.WebdavStore;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
 public class DoGet extends DoHead {
 
     public DoGet(WebdavStore store, String dftIndexFile, String insteadOf404,

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoHead.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoHead.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoHead.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -16,18 +16,19 @@
  */
 package net.sf.webdav.methods;
 
-import net.sf.webdav.WebdavStore;
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.webdav.MimeTyper;
 import net.sf.webdav.ResourceLocks;
-import net.sf.webdav.MimeTyper;
 import net.sf.webdav.WebdavStatus;
+import net.sf.webdav.WebdavStore;
 import net.sf.webdav.exceptions.AccessDeniedException;
 import net.sf.webdav.exceptions.ObjectAlreadyExistsException;
 import net.sf.webdav.exceptions.WebdavException;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
 public class DoHead extends AbstractMethod {
 
     protected String dftIndexFile;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoMkcol.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoMkcol.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoMkcol.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,17 +15,18 @@
  */
 package net.sf.webdav.methods;
 
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.webdav.ResourceLocks;
 import net.sf.webdav.WebdavStatus;
 import net.sf.webdav.WebdavStore;
-import net.sf.webdav.ResourceLocks;
+import net.sf.webdav.exceptions.AccessDeniedException;
 import net.sf.webdav.exceptions.ObjectAlreadyExistsException;
-import net.sf.webdav.exceptions.AccessDeniedException;
 import net.sf.webdav.exceptions.WebdavException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
 public class DoMkcol extends DeterminableMethod {
 
     private static org.slf4j.Logger log = org.slf4j.LoggerFactory

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoMove.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoMove.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoMove.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,18 +15,18 @@
  */
 package net.sf.webdav.methods;
 
+import java.io.IOException;
+import java.util.Hashtable;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.webdav.ResourceLocks;
 import net.sf.webdav.WebdavStatus;
-import net.sf.webdav.WebdavStore;
-import net.sf.webdav.ResourceLocks;
 import net.sf.webdav.exceptions.AccessDeniedException;
 import net.sf.webdav.exceptions.ObjectAlreadyExistsException;
 import net.sf.webdav.exceptions.WebdavException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Hashtable;
-import java.io.IOException;
-
 public class DoMove extends ReportingMethod {
 
     private static org.slf4j.Logger log = org.slf4j.LoggerFactory

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoOptions.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoOptions.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/DoOptions.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,16 +15,17 @@
  */
 package net.sf.webdav.methods;
 
-import net.sf.webdav.WebdavStore;
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import net.sf.webdav.ResourceLocks;
 import net.sf.webdav.WebdavStatus;
+import net.sf.webdav.WebdavStore;
 import net.sf.webdav.exceptions.AccessDeniedException;
 import net.sf.webdav.exceptions.WebdavException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
 public class DoOptions extends DeterminableMethod {
 
     private static org.slf4j.Logger log = org.slf4j.LoggerFactory

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/ReportingMethod.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/ReportingMethod.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/net/sf/webdav/methods/ReportingMethod.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,16 +15,17 @@
  */
 package net.sf.webdav.methods;
 
-import net.sf.webdav.WebdavStatus;
-import net.sf.webdav.fromcatalina.XMLWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Enumeration;
+import java.util.Hashtable;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.io.IOException;
-import java.io.Writer;
 
+import net.sf.webdav.WebdavStatus;
+import net.sf.webdav.fromcatalina.XMLWriter;
+
 public abstract class ReportingMethod extends AbstractMethod {
 
     /**

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoginWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoginWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoginWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -28,12 +28,7 @@
 import com.google.gwt.user.client.ui.PasswordTextBox;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.core.EventObject;
 
-import com.gwtext.client.widgets.Window;
-import com.gwtext.client.widgets.event.ButtonListenerAdapter;
-import com.gwtext.client.widgets.layout.FitLayout;
-
 /**
  * Used for logging in, obviously !
  *

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/CategoryManager.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -21,28 +21,16 @@
 import org.drools.guvnor.client.categorynav.CategoryExplorerWidget;
 import org.drools.guvnor.client.categorynav.CategorySelectHandler;
 import org.drools.guvnor.client.common.GenericCallback;
-import org.drools.guvnor.client.common.ImageButton;
 import org.drools.guvnor.client.common.PrettyFormLayout;
-import org.drools.guvnor.client.decisiontable.GuidedDecisionTableWidget;
-import org.drools.guvnor.client.modeldriven.dt.ActionCol;
-import org.drools.guvnor.client.modeldriven.dt.ActionSetFieldCol;
-import org.drools.guvnor.client.modeldriven.dt.AttributeCol;
-import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
-import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
-import org.drools.guvnor.client.packages.SuggestionCompletionCache;
-import org.drools.guvnor.client.rpc.MetaData;
 import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.RuleAsset;
 
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryExplorerWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryExplorerWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryExplorerWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,22 +17,18 @@
 
 
 
-import org.drools.guvnor.client.common.ErrorPopup;
 import org.drools.guvnor.client.common.GenericCallback;
 import org.drools.guvnor.client.rpc.RepositoryServiceAsync;
 import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
 
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.AbsolutePanel;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.Tree;
 import com.google.gwt.user.client.ui.TreeItem;
 import com.google.gwt.user.client.ui.TreeListener;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/DirtyableFlexTable.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.Widget;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/LoadingPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/LoadingPopup.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/LoadingPopup.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,14 +17,6 @@
 
 
 
-import com.google.gwt.user.client.Timer;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.PopupPanel;
-import com.google.gwt.user.client.ui.Widget;
 import com.gwtext.client.widgets.MessageBox;
 import com.gwtext.client.widgets.MessageBoxConfig;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/RulePackageSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/RulePackageSelector.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/RulePackageSelector.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,14 +17,11 @@
 
 
 
-import java.util.Iterator;
-
 import org.drools.guvnor.client.rpc.PackageConfigData;
 import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
 
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
-import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.ListBox;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionInsertColumn.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionInsertColumn.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/ActionInsertColumn.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -10,7 +10,6 @@
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.guvnor.client.modeldriven.dt.ActionCol;
 import org.drools.guvnor.client.modeldriven.dt.ActionInsertFactCol;
-import org.drools.guvnor.client.modeldriven.dt.ConditionCol;
 import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
 
 import com.google.gwt.user.client.Command;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationPanel.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationPanel.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,13 +1,17 @@
 package org.drools.guvnor.client.explorer;
 
+import org.drools.guvnor.client.admin.ArchivedAssetManager;
+import org.drools.guvnor.client.admin.BackupManager;
+import org.drools.guvnor.client.admin.CategoryManager;
+import org.drools.guvnor.client.admin.LogViewer;
+import org.drools.guvnor.client.admin.PermissionViewer;
+import org.drools.guvnor.client.admin.StateManager;
+
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.gwtext.client.core.EventObject;
 import com.gwtext.client.widgets.tree.TreeNode;
 import com.gwtext.client.widgets.tree.TreePanel;
 import com.gwtext.client.widgets.tree.event.TreePanelListenerAdapter;
-import org.drools.guvnor.client.admin.*;
-import org.drools.guvnor.client.explorer.ExplorerNodeConfig;
-import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
 
 /**
  * @author Anton Arhipov

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/CategoriesPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/CategoriesPanel.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/CategoriesPanel.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,5 +1,12 @@
 package org.drools.guvnor.client.explorer;
 
+import org.drools.guvnor.client.common.GenericCallback;
+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.security.Capabilities;
+
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.gwtext.client.core.EventObject;
 import com.gwtext.client.widgets.Toolbar;
@@ -7,16 +14,6 @@
 import com.gwtext.client.widgets.tree.TreeNode;
 import com.gwtext.client.widgets.tree.TreePanel;
 import com.gwtext.client.widgets.tree.event.TreePanelListenerAdapter;
-import org.drools.guvnor.client.common.GenericCallback;
-import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
-import org.drools.guvnor.client.explorer.ExplorerNodeConfig;
-import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
-import org.drools.guvnor.client.explorer.RulesNewMenu;
-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.security.Capabilities;
 
 /**
  * @author Anton Arhipov

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/DeploymentPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/DeploymentPanel.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/DeploymentPanel.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,5 +1,11 @@
 package org.drools.guvnor.client.explorer;
 
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.packages.SnapshotView;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rpc.SnapshotInfo;
+
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.gwtext.client.core.EventObject;
 import com.gwtext.client.data.Node;
@@ -14,13 +20,6 @@
 import com.gwtext.client.widgets.tree.TreeNode;
 import com.gwtext.client.widgets.tree.TreePanel;
 import com.gwtext.client.widgets.tree.event.TreePanelListenerAdapter;
-import org.drools.guvnor.client.common.GenericCallback;
-import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
-import org.drools.guvnor.client.explorer.PackageHierarchy;
-import org.drools.guvnor.client.packages.SnapshotView;
-import org.drools.guvnor.client.rpc.PackageConfigData;
-import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rpc.SnapshotInfo;
 
 /**
  * @author Anton Arhipov

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,5 +1,8 @@
 package org.drools.guvnor.client.explorer;
 
+import org.drools.guvnor.client.LoggedInUserInfo;
+import org.drools.guvnor.client.security.Capabilities;
+
 import com.google.gwt.user.client.ui.DockPanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.gwtext.client.core.Margins;
@@ -13,8 +16,6 @@
 import com.gwtext.client.widgets.layout.FitLayout;
 import com.gwtext.client.widgets.tree.TreeNode;
 import com.gwtext.client.widgets.tree.TreePanel;
-import org.drools.guvnor.client.LoggedInUserInfo;
-import org.drools.guvnor.client.security.Capabilities;
 
 public class ExplorerLayoutManager {
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,10 +1,7 @@
 package org.drools.guvnor.client.explorer;
 
-import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 import org.drools.guvnor.client.common.GenericCallback;
 import org.drools.guvnor.client.common.LoadingPopup;
@@ -21,14 +18,10 @@
 
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.History;
-import com.google.gwt.user.client.HistoryListener;
 import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.FocusPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.gwtext.client.core.EventObject;
 import com.gwtext.client.core.Ext;
-import com.gwtext.client.core.Function;
 import com.gwtext.client.core.Margins;
 import com.gwtext.client.core.RegionPosition;
 import com.gwtext.client.widgets.Button;
@@ -36,16 +29,10 @@
 import com.gwtext.client.widgets.Container;
 import com.gwtext.client.widgets.Panel;
 import com.gwtext.client.widgets.TabPanel;
-import com.gwtext.client.widgets.Tool;
-import com.gwtext.client.widgets.Toolbar;
-import com.gwtext.client.widgets.ToolbarButton;
-import com.gwtext.client.widgets.Tool.ToolType;
 import com.gwtext.client.widgets.event.ButtonListenerAdapter;
 import com.gwtext.client.widgets.event.PanelListenerAdapter;
-import com.gwtext.client.widgets.event.TabPanelListener;
 import com.gwtext.client.widgets.event.TabPanelListenerAdapter;
 import com.gwtext.client.widgets.layout.BorderLayoutData;
-import com.gwtext.client.widgets.layout.LayoutData;
 
 /**
  * This is the tab panel manager.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/GenericPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/GenericPanel.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/GenericPanel.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,12 +1,13 @@
 package org.drools.guvnor.client.explorer;
 
+import org.drools.guvnor.client.ruleeditor.NewAssetWizard;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
+
 import com.google.gwt.user.client.ui.Widget;
 import com.gwtext.client.widgets.Panel;
 import com.gwtext.client.widgets.tree.TreeNode;
 import com.gwtext.client.widgets.tree.TreePanel;
 import com.gwtext.client.widgets.tree.event.TreePanelListenerAdapter;
-import org.drools.guvnor.client.ruleeditor.NewAssetWizard;
-import org.drools.guvnor.client.rulelist.EditItemEvent;
 
 /**
  * @author Anton Arhipov

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/PackagesPanel.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,5 +1,15 @@
 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.packages.NewPackageWizard;
+import org.drools.guvnor.client.rpc.PackageConfigData;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.rulelist.AssetItemGrid;
+import org.drools.guvnor.client.rulelist.AssetItemGridDataLoader;
+import org.drools.guvnor.client.rulelist.EditItemEvent;
+
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.ScrollPanel;
@@ -19,18 +29,6 @@
 import com.gwtext.client.widgets.tree.TreePanel;
 import com.gwtext.client.widgets.tree.event.TreePanelListener;
 import com.gwtext.client.widgets.tree.event.TreePanelListenerAdapter;
-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.explorer.ExplorerNodeConfig;
-import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
-import org.drools.guvnor.client.explorer.PackageHierarchy;
-import org.drools.guvnor.client.packages.NewPackageWizard;
-import org.drools.guvnor.client.rpc.PackageConfigData;
-import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.rulelist.AssetItemGrid;
-import org.drools.guvnor.client.rulelist.AssetItemGridDataLoader;
-import org.drools.guvnor.client.rulelist.EditItemEvent;
 
 /**
  * @author Anton Arhipov

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/QAPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/QAPanel.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/QAPanel.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,8 +2,6 @@
 
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.gwtext.client.widgets.tree.TreePanel;
-import org.drools.guvnor.client.explorer.ExplorerNodeConfig;
-import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
 
 /**
  * @author Anton Arhipov

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/RulesNewMenu.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/RulesNewMenu.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/RulesNewMenu.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,12 +1,12 @@
 package org.drools.guvnor.client.explorer;
 
+import org.drools.guvnor.client.common.AssetFormats;
+
+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.Item;
-import com.gwtext.client.widgets.menu.BaseItem;
 import com.gwtext.client.widgets.menu.event.BaseItemListenerAdapter;
-import com.gwtext.client.core.EventObject;
-import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.guvnor.client.explorer.GenericPanel;
 
 /**
  * TODO: this class should be generated via ant task:  'ant plug-editors'

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -10,8 +10,8 @@
 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.guvnor.client.ruleeditor.RuleViewer;
 
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Window;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionCallMethodWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionCallMethodWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionCallMethodWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -7,30 +7,24 @@
 
 import org.drools.guvnor.client.common.DirtyableComposite;
 import org.drools.guvnor.client.common.DirtyableFlexTable;
-import org.drools.guvnor.client.common.FieldEditListener;
 import org.drools.guvnor.client.common.FormStylePopup;
 import org.drools.guvnor.client.common.ImageButton;
 import org.drools.guvnor.client.common.SmallLabel;
 import org.drools.guvnor.client.modeldriven.DropDownData;
 import org.drools.guvnor.client.modeldriven.HumanReadable;
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.guvnor.client.modeldriven.brl.ActionCallMethod;
 import org.drools.guvnor.client.modeldriven.brl.ActionFieldFunction;
 import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
-import org.drools.guvnor.client.modeldriven.brl.ActionCallMethod;
-import org.drools.guvnor.client.modeldriven.brl.ActionSetField;
-import org.drools.guvnor.client.modeldriven.brl.ActionUpdateField;
 import org.drools.guvnor.client.modeldriven.brl.FactPattern;
 
-import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.KeyboardListener;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -23,7 +23,6 @@
 import org.drools.guvnor.client.common.DirtyableVerticalPane;
 import org.drools.guvnor.client.common.FormStylePopup;
 import org.drools.guvnor.client.common.ImageButton;
-import org.drools.guvnor.client.common.SmallLabel;
 import org.drools.guvnor.client.modeldriven.HumanReadable;
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.guvnor.client.modeldriven.brl.CompositeFactPattern;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -23,7 +23,6 @@
 import java.util.List;
 
 import org.drools.guvnor.client.common.DirtyableComposite;
-import org.drools.guvnor.client.common.DirtyableHorizontalPane;
 import org.drools.guvnor.client.common.SmallLabel;
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.guvnor.client.modeldriven.brl.DSLSentence;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -23,19 +23,14 @@
 import org.drools.guvnor.client.common.ClickableLabel;
 import org.drools.guvnor.client.common.DirtyableComposite;
 import org.drools.guvnor.client.common.DirtyableFlexTable;
-import org.drools.guvnor.client.common.DirtyableHorizontalPane;
-import org.drools.guvnor.client.common.FormStylePopup;
 import org.drools.guvnor.client.common.ImageButton;
-import org.drools.guvnor.client.common.InfoPopup;
 import org.drools.guvnor.client.common.SmallLabel;
 import org.drools.guvnor.client.modeldriven.HumanReadable;
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.guvnor.client.modeldriven.brl.CompositeFieldConstraint;
-import org.drools.guvnor.client.modeldriven.brl.ConnectiveConstraint;
 import org.drools.guvnor.client.modeldriven.brl.FactPattern;
 import org.drools.guvnor.client.modeldriven.brl.FieldConstraint;
 import org.drools.guvnor.client.modeldriven.brl.IPattern;
-import org.drools.guvnor.client.modeldriven.brl.ISingleFieldConstraint;
 import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
 import org.drools.guvnor.client.modeldriven.ui.factPattern.Connectives;
 import org.drools.guvnor.client.modeldriven.ui.factPattern.PopupCreator;
@@ -43,27 +38,16 @@
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.AbsolutePanel;
-import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.MouseListener;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
-import com.gwtext.client.core.EventObject;
-import com.gwtext.client.widgets.ToolbarMenuButton;
-import com.gwtext.client.widgets.menu.BaseItem;
-import com.gwtext.client.widgets.menu.Item;
-import com.gwtext.client.widgets.menu.Menu;
-import com.gwtext.client.widgets.menu.event.BaseItemListenerAdapter;
 
 /**
  * This is the new smart widget that works off the model.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleAttributeWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -29,7 +29,6 @@
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.CheckBox;
 import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.KeyboardListener;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -20,7 +20,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.drools.guvnor.client.common.AssetFormats;
 import org.drools.guvnor.client.common.DirtyableComposite;
 import org.drools.guvnor.client.common.DirtyableFlexTable;
 import org.drools.guvnor.client.common.DirtyableHorizontalPane;
@@ -30,7 +29,6 @@
 import org.drools.guvnor.client.common.ImageButton;
 import org.drools.guvnor.client.common.SmallLabel;
 import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
-import org.drools.guvnor.client.explorer.RulesNewMenu;
 import org.drools.guvnor.client.modeldriven.HumanReadable;
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.guvnor.client.modeldriven.brl.ActionCallMethod;
@@ -65,12 +63,6 @@
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.core.EventObject;
-import com.gwtext.client.widgets.ToolbarMenuButton;
-import com.gwtext.client.widgets.menu.BaseItem;
-import com.gwtext.client.widgets.menu.Item;
-import com.gwtext.client.widgets.menu.Menu;
-import com.gwtext.client.widgets.menu.event.BaseItemListenerAdapter;
 
 /**
  * This is the parent widget that contains the model based rule builder.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/AssetAttachmentFileWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/AssetAttachmentFileWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/AssetAttachmentFileWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -33,7 +33,6 @@
 import com.google.gwt.user.client.ui.FormSubmitCompleteEvent;
 import com.google.gwt.user.client.ui.FormSubmitEvent;
 import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -39,7 +39,6 @@
 import com.google.gwt.user.client.ui.FormSubmitEvent;
 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.Label;
 import com.google.gwt.user.client.ui.RadioButton;
 import com.google.gwt.user.client.ui.TextArea;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -24,7 +24,6 @@
 
 import org.drools.guvnor.client.categorynav.CategoryExplorerWidget;
 import org.drools.guvnor.client.categorynav.CategorySelectHandler;
-import org.drools.guvnor.client.common.DirtyableHorizontalPane;
 import org.drools.guvnor.client.common.FormStylePopup;
 import org.drools.guvnor.client.common.GenericCallback;
 import org.drools.guvnor.client.common.ImageButton;
@@ -34,7 +33,6 @@
 import org.drools.guvnor.client.common.SmallLabel;
 import org.drools.guvnor.client.common.StatusChangePopup;
 import org.drools.guvnor.client.common.ValidationMessageWidget;
-import org.drools.guvnor.client.modeldriven.ui.RuleAttributeWidget;
 import org.drools.guvnor.client.rpc.PackageConfigData;
 import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
 import org.drools.guvnor.client.rpc.ValidatedResponse;
@@ -51,7 +49,6 @@
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.VerticalPanel;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -8,7 +8,6 @@
 import org.drools.guvnor.client.explorer.ExplorerNodeConfig;
 import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
 import org.drools.guvnor.client.explorer.GenericPanel;
-import org.drools.guvnor.client.explorer.PackagesPanel;
 import org.drools.guvnor.client.rpc.PackageConfigData;
 import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
 import org.drools.guvnor.client.rpc.SnapshotInfo;
@@ -26,7 +25,6 @@
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioHelper.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioHelper.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -7,7 +7,6 @@
 import java.util.Map;
 
 import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
-import org.drools.guvnor.client.modeldriven.testing.Expectation;
 import org.drools.guvnor.client.modeldriven.testing.FactData;
 import org.drools.guvnor.client.modeldriven.testing.FieldData;
 import org.drools.guvnor.client.modeldriven.testing.Fixture;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -23,7 +23,6 @@
 
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.guvnor.client.modeldriven.testing.Scenario;
-import org.drools.guvnor.client.security.Capabilities;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.SerializableException;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,9 +17,6 @@
 
 
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.rpc.RemoteService;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,7 +17,6 @@
 
 
 
-import org.drools.guvnor.client.common.DirtyableComposite;
 import org.drools.guvnor.client.common.FormStylePopup;
 
 import com.google.gwt.user.client.Command;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DefaultRuleContentWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -20,7 +20,6 @@
 import org.drools.guvnor.client.rpc.RuleAsset;
 import org.drools.guvnor.client.rpc.RuleContentText;
 
-import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.KeyboardListenerAdapter;
 import com.google.gwt.user.client.ui.TextArea;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -28,7 +28,6 @@
 import org.drools.guvnor.client.packages.ModelAttachmentFileWidget;
 import org.drools.guvnor.client.qa.ScenarioWidget;
 import org.drools.guvnor.client.rpc.RuleAsset;
-import org.drools.guvnor.client.rpc.RuleContentText;
 
 import com.google.gwt.user.client.ui.Widget;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/PropertiesWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,22 +15,31 @@
  * limitations under the License.
  */
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
+import org.drools.guvnor.client.rpc.RuleAsset;
+
 import com.gwtext.client.core.EventObject;
-import com.gwtext.client.data.*;
+import com.gwtext.client.data.ArrayReader;
+import com.gwtext.client.data.FieldDef;
+import com.gwtext.client.data.MemoryProxy;
+import com.gwtext.client.data.Record;
+import com.gwtext.client.data.RecordDef;
+import com.gwtext.client.data.Store;
+import com.gwtext.client.data.StringFieldDef;
 import com.gwtext.client.widgets.Button;
 import com.gwtext.client.widgets.Panel;
 import com.gwtext.client.widgets.Toolbar;
 import com.gwtext.client.widgets.ToolbarButton;
 import com.gwtext.client.widgets.event.ButtonListenerAdapter;
 import com.gwtext.client.widgets.form.TextField;
-import com.gwtext.client.widgets.grid.*;
-import com.gwtext.client.widgets.grid.event.GridRowListener;
-import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
-import org.drools.guvnor.client.rpc.RuleAsset;
+import com.gwtext.client.widgets.grid.ColumnConfig;
+import com.gwtext.client.widgets.grid.ColumnModel;
+import com.gwtext.client.widgets.grid.EditorGridPanel;
+import com.gwtext.client.widgets.grid.GridEditor;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Properties (key/value pairs) editor with a file attachment.
  *

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/XmlFileWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/XmlFileWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/XmlFileWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,12 +1,13 @@
 package org.drools.guvnor.client.ruleeditor;
 
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.TextArea;
-import com.google.gwt.user.client.ui.Widget;
 import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
 import org.drools.guvnor.client.rpc.RuleAsset;
 import org.drools.guvnor.client.rpc.RuleContentText;
 
+import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.user.client.ui.TextArea;
+import com.google.gwt.user.client.ui.Widget;
+
 /**
  *
  */

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowViewer.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/RuleFlowViewer.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,7 +17,6 @@
  */
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/TransferRuleFlowNodeFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/TransferRuleFlowNodeFactory.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulefloweditor/TransferRuleFlowNodeFactory.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,7 +17,6 @@
  */
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 import org.drools.guvnor.client.rpc.RuleFlowContentModel;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QuickFindWidget.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -42,7 +42,6 @@
 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.gwtext.client.widgets.form.FormPanel;
 
 /**
  * This is for quickly finding an asset by name. Partial completion is allowed.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -47,8 +47,6 @@
 import org.drools.RuleBaseConfiguration;
 import org.drools.RuleBaseFactory;
 import org.drools.SessionConfiguration;
-import org.drools.audit.WorkingMemoryInMemoryLogger;
-import org.drools.audit.event.LogEvent;
 import org.drools.base.ClassTypeResolver;
 import org.drools.common.AbstractRuleBase;
 import org.drools.common.DroolsObjectOutputStream;
@@ -128,8 +126,8 @@
 import org.jboss.seam.annotations.security.Restrict;
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.security.Identity;
-import org.mvel.MVEL;
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.MVEL;
+import org.mvel2.templates.TemplateRuntime;
 
 import com.google.gwt.user.client.rpc.SerializableException;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -16,6 +16,13 @@
  * 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.jar.JarInputStream;
+
 import org.drools.compiler.DroolsError;
 import org.drools.compiler.DroolsParserException;
 import org.drools.guvnor.client.common.AssetFormats;
@@ -26,16 +33,13 @@
 import org.drools.guvnor.server.selector.AssetSelector;
 import org.drools.guvnor.server.selector.SelectorManager;
 import org.drools.lang.descr.PackageDescr;
-import org.drools.repository.*;
+import org.drools.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;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.jar.JarInputStream;
-
 /**
  * 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.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BRLContentHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -19,10 +19,6 @@
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 import org.drools.compiler.DroolsParserException;
 import org.drools.guvnor.client.modeldriven.brl.RuleModel;
@@ -32,7 +28,6 @@
 import org.drools.guvnor.server.util.BRDRLPersistence;
 import org.drools.guvnor.server.util.BRXMLPersistence;
 import org.drools.repository.AssetItem;
-import org.drools.repository.CategoryItem;
 import org.drools.repository.PackageItem;
 
 import com.google.gwt.user.client.rpc.SerializableException;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,12 +17,10 @@
 
 
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.StringTokenizer;
 
 import org.drools.guvnor.client.rpc.RuleAsset;
 import org.drools.repository.AssetItem;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/DSLRuleContentHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -29,7 +29,6 @@
 import org.drools.guvnor.server.builder.ContentAssemblyError;
 import org.drools.guvnor.server.builder.ContentPackageAssembler;
 import org.drools.lang.ExpanderException;
-import org.drools.lang.dsl.DSLMappingFile;
 import org.drools.lang.dsl.DefaultExpander;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/FactModelContentHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,7 +1,6 @@
 package org.drools.guvnor.server.contenthandler;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/GuidedDTContentHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -19,23 +19,15 @@
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 import org.drools.compiler.DroolsParserException;
-import org.drools.guvnor.client.modeldriven.brl.RuleModel;
 import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
 import org.drools.guvnor.client.rpc.RuleAsset;
 import org.drools.guvnor.server.builder.BRMSPackageBuilder;
 import org.drools.guvnor.server.builder.ContentPackageAssembler;
-import org.drools.guvnor.server.util.BRDRLPersistence;
-import org.drools.guvnor.server.util.BRXMLPersistence;
 import org.drools.guvnor.server.util.GuidedDTDRLPersistence;
 import org.drools.guvnor.server.util.GuidedDTXMLPersistence;
 import org.drools.repository.AssetItem;
-import org.drools.repository.CategoryItem;
 import org.drools.repository.PackageItem;
 
 import com.google.gwt.user.client.rpc.SerializableException;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -23,7 +23,6 @@
 
 import org.drools.guvnor.client.rpc.RuleAsset;
 import org.drools.guvnor.server.ServiceImplementation;
-import org.drools.guvnor.server.builder.ContentPackageAssembler;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/PropertiesHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,16 +15,17 @@
  * limitations under the License.
  */
 
-import com.google.gwt.user.client.rpc.SerializableException;
+import java.io.ByteArrayInputStream;
+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 java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import com.google.gwt.user.client.rpc.SerializableException;
 
 /**
  * Handle *.properties file as a content for rule asset instead of a binary attachment

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/XmlFileHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/XmlFileHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/XmlFileHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,15 +1,16 @@
 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.AssetItem;
+
 import com.google.gwt.user.client.rpc.SerializableException;
 
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
-
 /**
  *
  */

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -16,6 +16,17 @@
  * limitations under the License.
  */
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.FileUploadException;
@@ -49,17 +60,6 @@
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.security.Identity;
 
-import javax.jcr.RepositoryException;
-import javax.servlet.http.HttpServletRequest;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * This assists the file manager servlets.
  * @author Fernando Meyer

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -19,7 +19,6 @@
 
 import org.apache.log4j.Logger;
 import org.jboss.seam.annotations.Name;
-import org.jboss.seam.security.Identity;
 
 /**
  * This will let any user in, effectively removing any authentication (as the system 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermissionManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermissionManager.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/RoleBasedPermissionManager.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -24,10 +24,8 @@
 import org.jboss.seam.annotations.AutoCreate;
 import org.jboss.seam.annotations.Create;
 import org.jboss.seam.annotations.Destroy;
-import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Unwrap;
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.security.Identity;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,7 +17,6 @@
 
 
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,6 +1,5 @@
 package org.drools.guvnor.server.selector;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/BRMSSuggestionCompletionLoader.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.jar.JarInputStream;
 
 import org.drools.guvnor.client.common.AssetFormats;

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/PropertiesPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/PropertiesPersistence.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/PropertiesPersistence.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -14,12 +14,12 @@
  * 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;
 
-import java.util.List;
-import java.util.ArrayList;
-
 /**
  * used to convert PropertiesHolder to text and back
  *

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -16,13 +16,13 @@
 import org.drools.guvnor.client.rpc.DetailedSerializableException;
 import org.drools.lang.descr.PackageDescr;
 import org.drools.verifier.Verifier;
+import org.drools.verifier.components.Field;
 import org.drools.verifier.components.ObjectType;
 import org.drools.verifier.components.VerifierRule;
-import org.drools.verifier.components.Field;
 import org.drools.verifier.dao.VerifierData;
 import org.drools.verifier.dao.VerifierResult;
+import org.drools.verifier.report.components.Severity;
 import org.drools.verifier.report.components.VerifierMessageBase;
-import org.drools.verifier.report.components.Severity;
 
 import com.google.gwt.user.client.rpc.SerializableException;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -13,9 +13,7 @@
 import org.drools.guvnor.server.security.PackageUUIDType;
 import org.drools.guvnor.server.security.RoleBasedPermission;
 import org.drools.guvnor.server.security.RoleBasedPermissionManager;
-import org.drools.guvnor.server.security.RoleBasedPermissionStore;
 import org.drools.guvnor.server.security.RoleTypes;
-import org.drools.repository.PackageItem;
 import org.drools.repository.RulesRepositoryException;
 import org.jboss.seam.Component;
 import org.jboss.seam.annotations.Create;
@@ -24,9 +22,6 @@
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.Startup;
 import org.jboss.seam.annotations.intercept.BypassInterceptors;
-import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.security.Identity;
-import org.jboss.seam.security.permission.PermissionResolver;
 
 /**
  * PermissionResolvers are chained together to resolve permission check, the check returns true if

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/CollectionsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/CollectionsTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/CollectionsTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,10 +1,14 @@
 package org.drools;
 
+import static org.drools.nvbj.List;
+import static org.drools.nvbj.Map;
+import static org.drools.nvbj.__;
+import static org.drools.nvbj.println;
+
 import java.util.List;
 import java.util.Map;
 
 import junit.framework.TestCase;
-import static org.drools.nvbj.*;
 
 
 public class CollectionsTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/common/AssetFormatsTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,8 +17,6 @@
 
 
 
-import org.drools.guvnor.client.common.AssetFormats;
-
 import junit.framework.TestCase;
 
 public class AssetFormatsTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/explorer/PackageHierarchyTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,11 +1,10 @@
 package org.drools.guvnor.client.explorer;
 
-import org.drools.guvnor.client.explorer.PackageHierarchy;
+import junit.framework.TestCase;
+
 import org.drools.guvnor.client.explorer.PackageHierarchy.Folder;
 import org.drools.guvnor.client.rpc.PackageConfigData;
 
-import junit.framework.TestCase;
-
 public class PackageHierarchyTest extends TestCase {
 
 	public void testSimple() {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/HumanReadableTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/HumanReadableTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/modeldriven/HumanReadableTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,8 +17,6 @@
 
 
 
-import org.drools.guvnor.client.modeldriven.HumanReadable;
-
 import junit.framework.TestCase;
 
 public class HumanReadableTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/NewPackageWizardTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,7 +1,5 @@
 package org.drools.guvnor.client.packages;
 
-import org.drools.guvnor.client.packages.PackageNameValidator;
-
 import junit.framework.TestCase;
 
 public class NewPackageWizardTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/packages/SuggestionCompletionCacheTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -20,7 +20,6 @@
 import junit.framework.TestCase;
 
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.guvnor.client.packages.SuggestionCompletionCache;
 
 import com.google.gwt.user.client.Command;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/ScenarioHelperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/ScenarioHelperTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/qa/ScenarioHelperTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,6 +4,8 @@
 import java.util.List;
 import java.util.Map;
 
+import junit.framework.TestCase;
+
 import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
 import org.drools.guvnor.client.modeldriven.testing.FactData;
 import org.drools.guvnor.client.modeldriven.testing.FieldData;
@@ -11,10 +13,7 @@
 import org.drools.guvnor.client.modeldriven.testing.RetractFact;
 import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
 import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
-import org.drools.guvnor.client.qa.ScenarioHelper;
 
-import junit.framework.TestCase;
-
 public class ScenarioHelperTest extends TestCase {
 
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/rpc/MetaDataTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,8 +17,6 @@
 
 
 
-import org.drools.guvnor.client.rpc.MetaData;
-
 import junit.framework.TestCase;
 
 public class MetaDataTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/ruleeditor/EditorLauncherTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,11 +17,10 @@
 
 
 
-import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.guvnor.client.ruleeditor.EditorLauncher;
-
 import junit.framework.TestCase;
 
+import org.drools.guvnor.client.common.AssetFormats;
+
 public class EditorLauncherTest extends TestCase {
 
     public void testIcons()  {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplSecurityTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,18 +1,18 @@
 package org.drools.guvnor.server;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import junit.framework.TestCase;
+
 import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.guvnor.client.rpc.RepositoryService;
+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.rpc.TableDataRow;
 import org.drools.guvnor.client.rulelist.AssetItemGrid;
 import org.drools.guvnor.server.security.MockIdentity;
 import org.drools.guvnor.server.security.MockRoleBasedPermissionStore;
@@ -29,14 +29,6 @@
 import org.jboss.seam.security.permission.PermissionResolver;
 import org.jboss.seam.security.permission.RoleBasedPermissionResolver;
 
- import org.drools.guvnor.client.common.AssetFormats;
- import org.drools.guvnor.client.rpc.MetaDataQuery;
- import org.drools.guvnor.client.rpc.RepositoryService;
- import org.drools.guvnor.client.rpc.RuleAsset;
- import org.drools.guvnor.client.rpc.RuleContentText;
-
-import junit.framework.TestCase;
-
 public class ServiceImplSecurityTest extends TestCase {
 
 	public void testLoadRuleAssetWithRoleBasedAuthrozationAnalyst() throws Exception {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/ServiceImplementationTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -24,7 +24,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import junit.framework.TestCase;
 
@@ -67,10 +66,7 @@
 import org.drools.guvnor.client.rpc.TableDataRow;
 import org.drools.guvnor.client.rpc.ValidatedResponse;
 import org.drools.guvnor.client.rulelist.AssetItemGrid;
-import org.drools.guvnor.server.ServiceImplementation;
 import org.drools.guvnor.server.security.MockIdentity;
-import org.drools.guvnor.server.security.PackageNameType;
-import org.drools.guvnor.server.security.RoleTypes;
 import org.drools.guvnor.server.util.BRXMLPersistence;
 import org.drools.guvnor.server.util.IO;
 import org.drools.guvnor.server.util.ScenarioXMLPersistence;
@@ -86,11 +82,8 @@
 import org.drools.util.BinaryRuleBaseLoader;
 import org.drools.util.DateUtils;
 import org.drools.util.DroolsStreamUtils;
-import org.jboss.seam.Component;
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.contexts.Lifecycle;
-import org.jboss.seam.security.AuthorizationException;
-import org.jboss.seam.security.permission.PermissionResolver;
 import org.jboss.seam.security.permission.RoleBasedPermissionResolver;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -38,9 +38,6 @@
 import org.drools.guvnor.client.modeldriven.brl.FactPattern;
 import org.drools.guvnor.client.modeldriven.brl.RuleModel;
 import org.drools.guvnor.server.ServiceImplementation;
-import org.drools.guvnor.server.builder.BRMSPackageBuilder;
-import org.drools.guvnor.server.builder.ContentAssemblyError;
-import org.drools.guvnor.server.builder.ContentPackageAssembler;
 import org.drools.guvnor.server.selector.AssetSelector;
 import org.drools.guvnor.server.selector.SelectorManager;
 import org.drools.guvnor.server.util.BRXMLPersistence;
@@ -51,7 +48,7 @@
 import org.drools.rule.Package;
 import org.drools.rule.Rule;
 import org.drools.ruleflow.core.RuleFlowProcess;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
 
 /**
  * This will unit test package assembly into a binary.

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentHandlerTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -22,16 +22,6 @@
 import org.drools.guvnor.client.common.AssetFormats;
 import org.drools.guvnor.client.modeldriven.dt.GuidedDecisionTable;
 import org.drools.guvnor.client.rpc.BuilderResult;
-import org.drools.guvnor.server.contenthandler.BRLContentHandler;
-import org.drools.guvnor.server.contenthandler.ContentManager;
-import org.drools.guvnor.server.contenthandler.DRLFileContentHandler;
-import org.drools.guvnor.server.contenthandler.DSLDefinitionContentHandler;
-import org.drools.guvnor.server.contenthandler.DSLRuleContentHandler;
-import org.drools.guvnor.server.contenthandler.DecisionTableXLSHandler;
-import org.drools.guvnor.server.contenthandler.DefaultContentHandler;
-import org.drools.guvnor.server.contenthandler.EnumerationContentHandler;
-import org.drools.guvnor.server.contenthandler.GuidedDTContentHandler;
-import org.drools.guvnor.server.contenthandler.ModelContentHandler;
 import org.drools.guvnor.server.util.GuidedDTXMLPersistence;
 import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
 import org.drools.repository.AssetItem;

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ContentManagerTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,12 +1,9 @@
 package org.drools.guvnor.server.contenthandler;
 
-import org.drools.guvnor.client.common.AssetFormats;
-import org.drools.guvnor.server.contenthandler.ContentManager;
-import org.drools.guvnor.server.contenthandler.DRLFileContentHandler;
-import org.drools.guvnor.server.contenthandler.ScenarioContentHandler;
-
 import junit.framework.TestCase;
 
+import org.drools.guvnor.client.common.AssetFormats;
+
 public class ContentManagerTest extends TestCase {
 
 	public void testConfig() throws Exception {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/DRLFileContentHandlerTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -18,8 +18,6 @@
 
 import junit.framework.TestCase;
 
-import org.drools.guvnor.server.contenthandler.DRLFileContentHandler;
-
 public class DRLFileContentHandlerTest extends TestCase {
 
 	public void testSniffDRLType() throws Exception {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/DeploymentURIHelperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/DeploymentURIHelperTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/DeploymentURIHelperTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,8 +17,6 @@
 
 
 
-import org.drools.guvnor.server.files.PackageDeploymentURIHelper;
-
 import junit.framework.TestCase;
 
 public class DeploymentURIHelperTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,16 +2,15 @@
 
 import java.io.ByteArrayOutputStream;
 
+import junit.framework.TestCase;
+
 import org.drools.guvnor.client.common.AssetFormats;
 import org.drools.guvnor.server.ServiceImplementation;
-import org.drools.guvnor.server.files.PackageDeploymentServlet;
 import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;
 import org.drools.repository.RulesRepository;
 
-import junit.framework.TestCase;
-
 public class PackageDeploymentServletTest extends TestCase {
 
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/RestAPIServletTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -7,17 +7,15 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import junit.framework.TestCase;
+
 import org.apache.util.Base64;
-import org.drools.guvnor.server.files.RestAPIServlet;
 import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
 import org.drools.repository.AssetItem;
 import org.drools.repository.AssetItemIterator;
 import org.drools.repository.PackageItem;
 import org.drools.repository.RulesRepository;
-import org.jboss.seam.mock.MockHttpServletResponse;
 
-import junit.framework.TestCase;
-
 public class RestAPIServletTest extends TestCase {
 
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/WebDAVImplTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/WebDAVImplTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/WebDAVImplTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.io.InputStream;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Iterator;
 
@@ -10,7 +9,6 @@
 import junit.framework.TestCase;
 
 import org.apache.commons.io.IOUtils;
-import org.drools.guvnor.server.files.WebDAVImpl;
 import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/BRMSRepositoryConfigurationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/BRMSRepositoryConfigurationTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/BRMSRepositoryConfigurationTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -20,8 +20,6 @@
 
 
 
-import org.drools.guvnor.server.repository.BRMSRepositoryConfiguration;
-
 import junit.framework.TestCase;
 
 public class BRMSRepositoryConfigurationTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/RulesRepositoryManagerTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,9 +17,6 @@
 
 
 
-import org.drools.guvnor.server.repository.BRMSRepositoryConfiguration;
-import org.drools.guvnor.server.repository.RulesRepositoryManager;
-
 import junit.framework.TestCase;
 
 public class RulesRepositoryManagerTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/rules/BRMSSuggestionCompletionLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/rules/BRMSSuggestionCompletionLoaderTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/rules/BRMSSuggestionCompletionLoaderTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -17,7 +17,6 @@
 
 
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -27,7 +26,6 @@
 import org.drools.guvnor.client.common.AssetFormats;
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.guvnor.server.ServiceImplementation;
-import org.drools.guvnor.server.rules.SuggestionCompletionLoader;
 import org.drools.guvnor.server.util.BRMSSuggestionCompletionLoader;
 import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
 import org.drools.repository.AssetItem;

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -3,10 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import junit.framework.TestCase;
+
 import org.drools.guvnor.client.security.Capabilities;
 
-import junit.framework.TestCase;
-
 public class CapabilityCalculatorTest extends TestCase {
 
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockIdentity.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockIdentity.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockIdentity.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -18,18 +18,14 @@
 
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.core.Events;
 import org.jboss.seam.security.Credentials;
 import org.jboss.seam.security.Identity;
 import org.jboss.seam.security.permission.PermissionResolver;
-import org.jboss.seam.security.permission.ResolverChain;
 
 public class MockIdentity extends Identity {
 	private boolean hasRole;

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockRoleBasedPermissionStore.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockRoleBasedPermissionStore.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/MockRoleBasedPermissionStore.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,15 +1,8 @@
 package org.drools.guvnor.server.security;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
-import javax.jcr.RepositoryException;
-
-import org.drools.repository.RulesRepository;
-import org.drools.repository.security.PermissionManager;
 import org.jboss.seam.annotations.AutoCreate;
-import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 
 @Name("org.drools.guvnor.server.security.RoleBasedPermissionStore")

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/NilAuthenticatorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/NilAuthenticatorTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/NilAuthenticatorTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,9 +1,5 @@
 package org.drools.guvnor.server.security;
 
-import java.util.HashMap;
-
-import org.jboss.seam.contexts.Lifecycle;
-
 import junit.framework.TestCase;
 
 public class NilAuthenticatorTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/RoleBasedPermissionStoreTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -19,19 +19,13 @@
 
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-import org.drools.guvnor.server.ServiceImplementation;
+import junit.framework.TestCase;
+
 import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
 import org.drools.repository.RulesRepository;
-import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.contexts.Lifecycle;
-import org.jboss.seam.security.Identity;
 
-import junit.framework.TestCase;
-
 public class RoleBasedPermissionStoreTest extends TestCase {
 	public void testGetRoleBasedPermissionsByUserName() throws Exception {
 		RoleBasedPermissionStore store = getStore();

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -22,15 +22,13 @@
 import java.util.List;
 import java.util.Map;
 
+import junit.framework.TestCase;
+
 import org.drools.guvnor.client.security.Capabilities;
-import org.drools.guvnor.server.security.SecurityServiceImpl;
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.contexts.Lifecycle;
 import org.jboss.seam.security.permission.RoleBasedPermissionResolver;
-import org.jboss.security.identity.RoleType;
 
-import junit.framework.TestCase;
-
 public class SecurityServiceImplTest extends TestCase {
 
     public void testLogin() throws Exception {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/SelectorManagerTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,10 +1,5 @@
 package org.drools.guvnor.server.selector;
 
-import org.drools.guvnor.server.selector.Allow;
-import org.drools.guvnor.server.selector.AssetSelector;
-import org.drools.guvnor.server.selector.RuleBasedSelector;
-import org.drools.guvnor.server.selector.SelectorManager;
-
 import junit.framework.TestCase;
 
 public class SelectorManagerTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/selector/TestSelector.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,6 +1,5 @@
 package org.drools.guvnor.server.selector;
 
-import org.drools.guvnor.server.selector.AssetSelector;
 import org.drools.repository.AssetItem;
 
 public class TestSelector

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -18,17 +18,13 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
+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;
 import org.drools.guvnor.server.util.ClassicDRLImporter.Asset;
-import org.drools.lang.DRLParser;
 
-import junit.framework.TestCase;
-
 public class ClassicDRLImporterTest extends TestCase {
 
     public void testStandardDRL() throws Exception {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -23,10 +23,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.security.SecureRandom;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -37,8 +34,6 @@
 import org.drools.guvnor.client.common.Snapshot;
 import org.drools.guvnor.server.ServiceImplementation;
 import org.drools.guvnor.server.files.FileManagerUtils;
-import org.drools.guvnor.server.util.FormData;
-import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;
 import org.drools.repository.RulesRepository;

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,12 +1,10 @@
 package org.drools.guvnor.server.util;
 
+import junit.framework.TestCase;
+
 import org.apache.log4j.Logger;
 import org.drools.guvnor.client.rpc.LogEntry;
-import org.drools.guvnor.server.util.LoggingHelper;
-import org.drools.guvnor.server.util.MessageList;
 
-import junit.framework.TestCase;
-
 public class LoggingHelperTest extends TestCase {
 
 	public void testAppender() {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/MetaDataMapperTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -20,7 +20,6 @@
 import junit.framework.TestCase;
 
 import org.drools.guvnor.client.rpc.MetaData;
-import org.drools.guvnor.server.util.MetaDataMapper;
 
 public class MetaDataMapperTest extends TestCase {
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/TableDisplayHandlerTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -19,8 +19,6 @@
 
 import java.lang.reflect.Method;
 
-import org.drools.guvnor.server.util.RowLoader;
-
 import junit.framework.TestCase;
 
 public class TableDisplayHandlerTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/jboss/seam/security/permission/RoleBasedPermissionResolverTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.Map;
 
+import junit.framework.TestCase;
+
 import org.drools.guvnor.server.security.CategoryPathType;
 import org.drools.guvnor.server.security.MockIdentity;
 import org.drools.guvnor.server.security.MockRoleBasedPermissionStore;
@@ -32,10 +34,7 @@
 import org.drools.guvnor.server.security.RoleTypes;
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.contexts.Lifecycle;
-import org.jboss.seam.security.Identity;
 
-import junit.framework.TestCase;
-
 public class RoleBasedPermissionResolverTest extends TestCase {
 
     public void testCategoryBasedPermissionAnalyst() throws Exception {

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/client/MinaKnowledgeBaseClient.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/client/MinaKnowledgeBaseClient.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/client/MinaKnowledgeBaseClient.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,42 +1,14 @@
 package org.drools.client;
 
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.mina.core.future.ConnectFuture;
-import org.apache.mina.core.service.IoHandler;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
-import org.apache.mina.filter.codec.serialization.ObjectSerializationEncoder;
-import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
-import org.apache.mina.transport.socket.SocketConnector;
-import org.apache.mina.transport.socket.nio.NioSocketConnector;
-import org.drools.eventmessaging.EventKey;
-import org.drools.eventmessaging.EventResponseHandler;
-import org.drools.task.AccessType;
-import org.drools.task.Attachment;
-import org.drools.task.Content;
-import org.drools.task.Comment;
 import org.drools.task.Task;
-import org.drools.task.User;
 import org.drools.task.service.BaseMinaClient;
 import org.drools.task.service.Command;
 import org.drools.task.service.CommandName;
 import org.drools.task.service.TaskClientHandler;
-import org.drools.task.service.TaskClientHandler.AddAttachmentResponseHandler;
-import org.drools.task.service.TaskClientHandler.AddCommentResponseHandler;
 import org.drools.task.service.TaskClientHandler.AddTaskResponseHandler;
-import org.drools.task.service.TaskClientHandler.GetContentResponseHandler;
-import org.drools.task.service.TaskClientHandler.GetTaskResponseHandler;
-import org.drools.task.service.TaskClientHandler.SetDocumentResponseHandler;
-import org.drools.task.service.TaskClientHandler.TaskSummaryResponseHandler;
 
 public class MinaKnowledgeBaseClient extends BaseMinaClient {
     

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/eventmessaging/EventKeys.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/eventmessaging/EventKeys.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/eventmessaging/EventKeys.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,10 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public class EventKeys {
     private Map<EventKey, List<EventTriggerTransport>> keys;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Attachment.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Attachment.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Attachment.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,17 +4,13 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.util.Arrays;
 import java.util.Date;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
 
 @Entity
 public class Attachment implements Externalizable {

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/BooleanExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/BooleanExpression.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/BooleanExpression.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Comment.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Comment.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Comment.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.Date;
 
 import javax.persistence.Entity;
@@ -13,7 +12,6 @@
 import javax.persistence.Id;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
 
 @Entity
 public class Comment implements Externalizable  {

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadline.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadline.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadline.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadlines.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadlines.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Deadlines.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Delegation.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Delegation.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Delegation.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,19 +4,15 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
 import javax.persistence.Embeddable;
-import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
 
 import org.drools.task.utils.CollectionUtils;
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/EmailNotification.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/EmailNotification.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/EmailNotification.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -8,7 +8,6 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Escalation.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Escalation.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Escalation.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Group.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Group.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Group.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,15 +4,8 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
 
 @Entity
 public class Group extends OrganizationalEntity

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/I18NText.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/I18NText.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/I18NText.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.List;
 
 import javax.persistence.Entity;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Notification.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Notification.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Notification.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,12 +4,10 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
 import javax.persistence.CascadeType;
-import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/OrganizationalEntity.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/OrganizationalEntity.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/OrganizationalEntity.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -6,8 +6,6 @@
 import java.io.ObjectOutput;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
 @Entity

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Reassignment.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Reassignment.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Reassignment.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Task.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Task.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/Task.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -14,7 +14,6 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
 import javax.persistence.OneToMany;
 
 import org.drools.task.utils.CollectionUtils;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskData.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskData.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/TaskData.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -13,7 +13,6 @@
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/User.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,14 +4,8 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
 
 @Entity
 public class User extends OrganizationalEntity implements Externalizable{

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/WorkItemNotification.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/WorkItemNotification.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/WorkItemNotification.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -11,8 +11,8 @@
 import org.drools.process.instance.WorkItem;
 import org.drools.process.instance.WorkItemHandler;
 import org.drools.process.instance.WorkItemManager;
-import org.mvel.MVEL;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.MVEL;
+import org.mvel2.compiler.ExpressionCompiler;
 
 public class WorkItemNotification {
     private String workItemExp;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/query/TaskSummary.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/query/TaskSummary.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/query/TaskSummary.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.Date;
 
 import org.drools.task.Status;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,15 +1,9 @@
 package org.drools.task.service;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IdleStatus;
-import org.apache.mina.core.session.IoSession;
-import org.drools.task.Content;
-import org.drools.task.Task;
-import org.drools.task.query.TaskSummary;
 
 public class BaseMinaHandler extends IoHandlerAdapter
 {       

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaServer.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaServer.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/BaseMinaServer.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -3,9 +3,6 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-
 import org.apache.mina.core.service.IoAcceptor;
 import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.core.session.IdleStatus;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/DefaultEscalatedDeadlineHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/DefaultEscalatedDeadlineHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/DefaultEscalatedDeadlineHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -14,14 +14,12 @@
 import org.drools.process.instance.WorkItemManager;
 import org.drools.process.instance.impl.WorkItemImpl;
 import org.drools.process.workitem.email.EmailWorkItemHandler;
-import org.drools.task.AccessType;
 import org.drools.task.Content;
 import org.drools.task.Deadline;
 import org.drools.task.EmailNotification;
 import org.drools.task.EmailNotificationHeader;
 import org.drools.task.Escalation;
 import org.drools.task.Group;
-import org.drools.task.I18NText;
 import org.drools.task.Notification;
 import org.drools.task.NotificationType;
 import org.drools.task.OrganizationalEntity;
@@ -32,9 +30,9 @@
 import org.drools.task.User;
 import org.drools.task.UserInfo;
 import org.drools.util.ChainedProperties;
-import org.mvel.MVEL;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.MVEL;
+import org.mvel2.compiler.ExpressionCompiler;
+import org.mvel2.templates.TemplateRuntime;
 
 public class DefaultEscalatedDeadlineHandler
     implements

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,11 +1,7 @@
 package org.drools.task.service;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IdleStatus;
 import org.apache.mina.core.session.IoSession;
 import org.drools.eventmessaging.EventResponseHandler;
 import org.drools.eventmessaging.Payload;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskOperation.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskOperation.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskOperation.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,8 +1,5 @@
 package org.drools.task.service;
 
-import org.drools.task.Status;
-import org.drools.task.Task;
-import org.drools.task.User;
 
 public enum TaskOperation {
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskService.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -21,9 +21,9 @@
 import org.drools.task.event.TaskEventListener;
 import org.drools.task.event.TaskEventSupport;
 import org.drools.task.query.DeadlineSummary;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.MVEL;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
 
 public class TaskService {
     EntityManagerFactory             emf;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/utils/CollectionUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/utils/CollectionUtils.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/utils/CollectionUtils.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,22 +4,13 @@
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.print.attribute.HashAttributeSet;
-
 import org.drools.task.Attachment;
 import org.drools.task.BooleanExpression;
 import org.drools.task.Comment;
 import org.drools.task.Deadline;
-import org.drools.task.Deadlines;
 import org.drools.task.EmailNotification;
 import org.drools.task.Escalation;
 import org.drools.task.Group;
@@ -29,7 +20,6 @@
 import org.drools.task.OrganizationalEntity;
 import org.drools.task.Reassignment;
 import org.drools.task.User;
-import org.hibernate.collection.PersistentBag;
 
 public class CollectionUtils {
     

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/BaseTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/BaseTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/BaseTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -3,55 +3,23 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.Serializable;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
-import javax.persistence.Query;
 
+import junit.framework.TestCase;
+
 import org.apache.commons.collections.map.HashedMap;
-import org.drools.task.Attachment;
-import org.drools.task.BooleanExpression;
-import org.drools.task.Comment;
-import org.drools.task.Deadline;
-import org.drools.task.Deadlines;
-import org.drools.task.Delegation;
-import org.drools.task.Escalation;
-import org.drools.task.Group;
-import org.drools.task.I18NText;
-import org.drools.task.Notification;
-import org.drools.task.OrganizationalEntity;
-import org.drools.task.PeopleAssignments;
-import org.drools.task.Reassignment;
-import org.drools.task.Status;
-import org.drools.task.Task;
-import org.drools.task.TaskData;
-import org.drools.task.User;
-import org.drools.task.query.TaskSummary;
 import org.drools.task.service.SendIcal;
 import org.drools.task.service.TaskService;
 import org.drools.task.service.TaskServiceSession;
-import org.drools.task.utils.CollectionUtils;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.util.MVELClassLoader;
+import org.mvel2.MVEL;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
 
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
-
-import junit.framework.TestCase;
-
 public abstract class BaseTest extends TestCase {
     protected EntityManagerFactory emf;
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/ModelPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/ModelPersistenceTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/ModelPersistenceTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,54 +1,15 @@
 package org.drools.task;
 
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.Serializable;
-import java.io.StringReader;
-import java.io.StringWriter;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
 import org.apache.commons.collections.map.HashedMap;
-import org.drools.task.Attachment;
-import org.drools.task.BooleanExpression;
-import org.drools.task.Comment;
-import org.drools.task.Deadline;
-import org.drools.task.Deadlines;
-import org.drools.task.Delegation;
-import org.drools.task.Escalation;
-import org.drools.task.Group;
-import org.drools.task.I18NText;
-import org.drools.task.Notification;
-import org.drools.task.OrganizationalEntity;
-import org.drools.task.PeopleAssignments;
-import org.drools.task.Reassignment;
-import org.drools.task.Status;
-import org.drools.task.Task;
-import org.drools.task.TaskData;
-import org.drools.task.User;
-import org.drools.task.service.TaskService;
 import org.drools.task.service.TaskServiceSession;
-import org.drools.task.utils.CollectionUtils;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.util.MVELClassLoader;
 
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
-
-import junit.framework.TestCase;
-
 public class ModelPersistenceTest extends BaseTest {
     
     protected void setUp() throws Exception {

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/QueryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/QueryTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/QueryTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,62 +1,16 @@
 package org.drools.task;
 
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.Serializable;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
 import org.apache.commons.collections.map.HashedMap;
-import org.drools.task.Attachment;
-import org.drools.task.BooleanExpression;
-import org.drools.task.Comment;
-import org.drools.task.Deadline;
-import org.drools.task.Deadlines;
-import org.drools.task.Delegation;
-import org.drools.task.Escalation;
-import org.drools.task.Group;
-import org.drools.task.I18NText;
-import org.drools.task.Notification;
-import org.drools.task.OrganizationalEntity;
-import org.drools.task.PeopleAssignments;
-import org.drools.task.Reassignment;
-import org.drools.task.Status;
-import org.drools.task.Task;
-import org.drools.task.TaskData;
-import org.drools.task.User;
 import org.drools.task.query.DeadlineSummary;
-import org.drools.task.query.TaskSummary;
-import org.drools.task.service.EscalatedDeadlineHandler;
-import org.drools.task.service.TaskService;
 import org.drools.task.service.TaskServiceSession;
 import org.drools.task.service.TaskServiceEscalationTest.MockEscalatedDeadlineHandler;
-import org.drools.task.utils.CollectionUtils;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.util.MVELClassLoader;
 
-import sun.print.resources.serviceui_zh_TW;
-
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
-
-import junit.framework.TestCase;
-
 public class QueryTest extends BaseTest {
 
     public void testUnescalatedDeadlines() throws Exception {

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/RunTaskService.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/RunTaskService.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/RunTaskService.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -15,9 +15,9 @@
 import org.drools.task.service.SendIcal;
 import org.drools.task.service.TaskService;
 import org.drools.task.service.TaskServiceSession;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.MVEL;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
 
 public class RunTaskService {
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/AbstractBlockingResponseHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/AbstractBlockingResponseHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/AbstractBlockingResponseHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,7 +4,6 @@
 package org.drools.task.service;
 
 import org.drools.task.service.BaseMinaHandler.ResponseHandler;
-import org.drools.task.service.TaskClientHandler.AddCommentResponseHandler;
 
 public abstract class AbstractBlockingResponseHandler
     implements

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingDeleteAttachmentResponseHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingDeleteAttachmentResponseHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingDeleteAttachmentResponseHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -3,10 +3,7 @@
  */
 package org.drools.task.service;
 
-import org.drools.eventmessaging.EventResponseHandler;
-import org.drools.eventmessaging.Payload;
 import org.drools.task.service.TaskClientHandler.DeleteAttachmentResponseHandler;
-import org.drools.task.service.TaskClientHandler.TaskOperationResponseHandler;
 
 public class BlockingDeleteAttachmentResponseHandler extends AbstractBlockingResponseHandler implements DeleteAttachmentResponseHandler {
       public void setIsDone(boolean done) {

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingDeleteCommentResponseHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingDeleteCommentResponseHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingDeleteCommentResponseHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -3,10 +3,7 @@
  */
 package org.drools.task.service;
 
-import org.drools.eventmessaging.EventResponseHandler;
-import org.drools.eventmessaging.Payload;
 import org.drools.task.service.TaskClientHandler.DeleteCommentResponseHandler;
-import org.drools.task.service.TaskClientHandler.TaskOperationResponseHandler;
 
 public class BlockingDeleteCommentResponseHandler extends AbstractBlockingResponseHandler implements DeleteCommentResponseHandler {
       public void setIsDone(boolean done) {

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingTaskOperationResponseHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingTaskOperationResponseHandler.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/BlockingTaskOperationResponseHandler.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -3,8 +3,6 @@
  */
 package org.drools.task.service;
 
-import org.drools.eventmessaging.EventResponseHandler;
-import org.drools.eventmessaging.Payload;
 import org.drools.task.service.TaskClientHandler.TaskOperationResponseHandler;
 
 public class BlockingTaskOperationResponseHandler extends AbstractBlockingResponseHandler implements TaskOperationResponseHandler {

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/DemoTaskService.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/DemoTaskService.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/DemoTaskService.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -30,9 +30,9 @@
 import org.drools.task.TaskData;
 import org.drools.task.User;
 import org.drools.task.query.TaskSummary;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.MVEL;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
 
 public class DemoTaskService {
 	

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,14 +1,11 @@
 package org.drools.task.service;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 import javax.mail.BodyPart;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceCommentsAndAttachmentsTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,36 +1,23 @@
 package org.drools.task.service;
 
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.io.StringReader;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.EntityManager;
-
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.drools.task.AccessType;
 import org.drools.task.Attachment;
-import org.drools.task.Content;
 import org.drools.task.BaseTest;
 import org.drools.task.Comment;
-import org.drools.task.Deadline;
+import org.drools.task.Content;
 import org.drools.task.Status;
 import org.drools.task.Task;
-import org.drools.task.query.TaskSummary;
-import org.drools.task.service.TaskClientHandler.DeleteCommentResponseHandler;
-import org.drools.task.service.TaskClientHandler.TaskSummaryResponseHandler;
-import org.drools.task.service.TaskServiceEscalationTest.MockEscalatedDeadlineHandler.Item;
-import org.drools.task.service.TaskServiceTest.BlockingAllOpenTasksForUseResponseHandler;
 import org.drools.task.utils.CollectionUtils;
 
-import junit.framework.TestCase;
-
 public class TaskServiceCommentsAndAttachmentsTest extends BaseTest {
     MinaTaskServer server;
     MinaTaskClient client;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -6,7 +6,6 @@
 import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -17,29 +16,14 @@
 
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
-import org.drools.eventmessaging.EventKey;
-import org.drools.eventmessaging.Payload;
 import org.drools.process.instance.WorkItemManager;
 import org.drools.process.instance.impl.DefaultWorkItemManager;
-import org.drools.process.instance.impl.WorkItemImpl;
-import org.drools.process.workitem.email.EmailWorkItemHandler;
 import org.drools.task.BaseTest;
 import org.drools.task.Content;
-import org.drools.task.EmailNotification;
 import org.drools.task.MockUserInfo;
 import org.drools.task.OrganizationalEntity;
 import org.drools.task.Status;
 import org.drools.task.Task;
-import org.drools.task.User;
-import org.drools.task.event.TaskUserEvent;
-import org.drools.task.event.TaskEventKey;
-import org.drools.task.service.DefaultEscalatedDeadlineHandler;
-import org.drools.util.ChainedProperties;
-import org.mvel.MVEL;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.templates.CompiledTemplate;
-import org.mvel.templates.TemplateCompiler;
-import org.mvel.templates.TemplateRuntime;
 import org.subethamail.wiser.Wiser;
 import org.subethamail.wiser.WiserMessage;
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -7,8 +7,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.transaction.Synchronization;
-
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.drools.task.BaseTest;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/userprofile/MockIdentity.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/userprofile/MockIdentity.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/userprofile/MockIdentity.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -18,18 +18,14 @@
 
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.core.Events;
 import org.jboss.seam.security.Credentials;
 import org.jboss.seam.security.Identity;
 import org.jboss.seam.security.permission.PermissionResolver;
-import org.jboss.seam.security.permission.ResolverChain;
 
 public class MockIdentity extends Identity {
 	private boolean hasRole;

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/userprofile/UserProfileManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/userprofile/UserProfileManagerTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/userprofile/UserProfileManagerTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -3,11 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import junit.framework.TestCase;
+
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.contexts.Lifecycle;
 
-import junit.framework.TestCase;
-
 public class UserProfileManagerTest extends TestCase {
 
     protected void setUp() throws Exception {

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/PackageDescrFlattener.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/PackageDescrFlattener.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/PackageDescrFlattener.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -31,11 +31,25 @@
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.lang.descr.VariableRestrictionDescr;
+import org.drools.verifier.components.Consequence;
+import org.drools.verifier.components.Constraint;
 import org.drools.verifier.components.EnumField;
 import org.drools.verifier.components.EnumRestriction;
+import org.drools.verifier.components.Field;
+import org.drools.verifier.components.LiteralRestriction;
+import org.drools.verifier.components.ObjectType;
+import org.drools.verifier.components.OperatorDescr;
+import org.drools.verifier.components.Pattern;
+import org.drools.verifier.components.PatternPossibility;
+import org.drools.verifier.components.QualifiedIdentifierRestriction;
+import org.drools.verifier.components.ReturnValueRestriction;
+import org.drools.verifier.components.RulePackage;
+import org.drools.verifier.components.RulePossibility;
+import org.drools.verifier.components.TextConsequence;
+import org.drools.verifier.components.Variable;
+import org.drools.verifier.components.VariableRestriction;
 import org.drools.verifier.components.VerifierAccessorDescr;
 import org.drools.verifier.components.VerifierAccumulateDescr;
-import org.drools.verifier.components.ObjectType;
 import org.drools.verifier.components.VerifierCollectDescr;
 import org.drools.verifier.components.VerifierComponent;
 import org.drools.verifier.components.VerifierComponentType;
@@ -46,20 +60,6 @@
 import org.drools.verifier.components.VerifierMethodAccessDescr;
 import org.drools.verifier.components.VerifierPredicateDescr;
 import org.drools.verifier.components.VerifierRule;
-import org.drools.verifier.components.Consequence;
-import org.drools.verifier.components.Constraint;
-import org.drools.verifier.components.Field;
-import org.drools.verifier.components.LiteralRestriction;
-import org.drools.verifier.components.OperatorDescr;
-import org.drools.verifier.components.Pattern;
-import org.drools.verifier.components.PatternPossibility;
-import org.drools.verifier.components.QualifiedIdentifierRestriction;
-import org.drools.verifier.components.ReturnValueRestriction;
-import org.drools.verifier.components.RulePackage;
-import org.drools.verifier.components.RulePossibility;
-import org.drools.verifier.components.TextConsequence;
-import org.drools.verifier.components.Variable;
-import org.drools.verifier.components.VariableRestriction;
 import org.drools.verifier.dao.VerifierData;
 
 /**

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/RuleSolver.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/RuleSolver.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/RuleSolver.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,7 +1,7 @@
 package org.drools.verifier;
 
+import org.drools.verifier.components.OperatorDescr;
 import org.drools.verifier.components.VerifierRule;
-import org.drools.verifier.components.OperatorDescr;
 
 /**
  * Takes a list of Constraints and makes possibilities from them.

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Solver.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Solver.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Solver.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -5,8 +5,8 @@
 import java.util.List;
 import java.util.Set;
 
+import org.drools.verifier.components.OperatorDescr;
 import org.drools.verifier.components.VerifierComponent;
-import org.drools.verifier.components.OperatorDescr;
 
 /**
  * Takes a list of Constraints and makes possibilities from them.

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Solvers.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Solvers.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Solvers.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,13 +4,13 @@
 import java.util.List;
 import java.util.Set;
 
-import org.drools.verifier.components.VerifierComponent;
-import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.components.OperatorDescr;
 import org.drools.verifier.components.Pattern;
 import org.drools.verifier.components.PatternPossibility;
 import org.drools.verifier.components.Restriction;
 import org.drools.verifier.components.RulePossibility;
+import org.drools.verifier.components.VerifierComponent;
+import org.drools.verifier.components.VerifierRule;
 
 /**
  * 

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierData.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierData.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierData.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,14 +2,11 @@
 
 import java.util.Collection;
 
-import org.drools.verifier.components.ObjectType;
-import org.drools.verifier.components.VerifierEvalDescr;
-import org.drools.verifier.components.VerifierPredicateDescr;
-import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.components.Consequence;
 import org.drools.verifier.components.Constraint;
 import org.drools.verifier.components.Field;
 import org.drools.verifier.components.FieldObjectTypeLink;
+import org.drools.verifier.components.ObjectType;
 import org.drools.verifier.components.OperatorDescr;
 import org.drools.verifier.components.Pattern;
 import org.drools.verifier.components.PatternPossibility;
@@ -17,6 +14,9 @@
 import org.drools.verifier.components.RulePackage;
 import org.drools.verifier.components.RulePossibility;
 import org.drools.verifier.components.Variable;
+import org.drools.verifier.components.VerifierEvalDescr;
+import org.drools.verifier.components.VerifierPredicateDescr;
+import org.drools.verifier.components.VerifierRule;
 
 /**
  * 

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierDataMaps.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierDataMaps.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierDataMaps.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -8,14 +8,11 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.drools.verifier.components.ObjectType;
-import org.drools.verifier.components.VerifierEvalDescr;
-import org.drools.verifier.components.VerifierPredicateDescr;
-import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.components.Consequence;
 import org.drools.verifier.components.Constraint;
 import org.drools.verifier.components.Field;
 import org.drools.verifier.components.FieldObjectTypeLink;
+import org.drools.verifier.components.ObjectType;
 import org.drools.verifier.components.OperatorDescr;
 import org.drools.verifier.components.Pattern;
 import org.drools.verifier.components.PatternPossibility;
@@ -23,6 +20,9 @@
 import org.drools.verifier.components.RulePackage;
 import org.drools.verifier.components.RulePossibility;
 import org.drools.verifier.components.Variable;
+import org.drools.verifier.components.VerifierEvalDescr;
+import org.drools.verifier.components.VerifierPredicateDescr;
+import org.drools.verifier.components.VerifierRule;
 
 /**
  * 

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierResult.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierResult.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierResult.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,11 +2,11 @@
 
 import java.util.Collection;
 
-import org.drools.verifier.report.components.VerifierMessageBase;
 import org.drools.verifier.report.components.Gap;
 import org.drools.verifier.report.components.MissingNumberPattern;
 import org.drools.verifier.report.components.RangeCheckCause;
 import org.drools.verifier.report.components.Severity;
+import org.drools.verifier.report.components.VerifierMessageBase;
 
 /**
  *

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierResultNormal.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierResultNormal.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/VerifierResultNormal.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -7,11 +7,11 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.drools.verifier.report.components.VerifierMessageBase;
 import org.drools.verifier.report.components.Gap;
 import org.drools.verifier.report.components.MissingNumberPattern;
 import org.drools.verifier.report.components.RangeCheckCause;
 import org.drools.verifier.report.components.Severity;
+import org.drools.verifier.report.components.VerifierMessageBase;
 
 /**
  *

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/ReportModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/ReportModeller.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/ReportModeller.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,11 +4,11 @@
 
 import org.drools.verifier.components.LiteralRestriction;
 import org.drools.verifier.dao.VerifierResult;
-import org.drools.verifier.report.components.VerifierMessage;
-import org.drools.verifier.report.components.VerifierMessageBase;
 import org.drools.verifier.report.components.Gap;
 import org.drools.verifier.report.components.MissingNumberPattern;
 import org.drools.verifier.report.components.Severity;
+import org.drools.verifier.report.components.VerifierMessage;
+import org.drools.verifier.report.components.VerifierMessageBase;
 
 import com.thoughtworks.xstream.XStream;
 

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ComponentsReportVisitor.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ComponentsReportVisitor.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ComponentsReportVisitor.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,15 +4,15 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.drools.verifier.components.Field;
 import org.drools.verifier.components.ObjectType;
-import org.drools.verifier.components.VerifierRule;
-import org.drools.verifier.components.Field;
 import org.drools.verifier.components.Restriction;
 import org.drools.verifier.components.RulePackage;
+import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.dao.VerifierData;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.report.components.RangeCheckCause;
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.templates.TemplateRuntime;
 
 class ComponentsReportVisitor extends ReportVisitor {
 

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/MissingRangesReportVisitor.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/MissingRangesReportVisitor.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/MissingRangesReportVisitor.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -10,11 +10,11 @@
 import org.drools.verifier.components.Field;
 import org.drools.verifier.components.LiteralRestriction;
 import org.drools.verifier.components.Restriction;
+import org.drools.verifier.dao.DataTree;
 import org.drools.verifier.dao.VerifierData;
-import org.drools.verifier.dao.DataTree;
+import org.drools.verifier.report.components.RangeCheckCause;
 import org.drools.verifier.report.components.VerifierRangeCheckMessage;
-import org.drools.verifier.report.components.RangeCheckCause;
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.templates.TemplateRuntime;
 
 class MissingRangesReportVisitor extends ReportVisitor {
 

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportModeller.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportModeller.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -11,7 +11,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.templates.TemplateRuntime;
 
 
 abstract class ReportModeller {

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportVisitor.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportVisitor.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportVisitor.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -6,7 +6,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.templates.TemplateRuntime;
 
 
 abstract class ReportVisitor {

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/VerifierMessagesVisitor.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/VerifierMessagesVisitor.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/VerifierMessagesVisitor.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -6,11 +6,11 @@
 import java.util.Map;
 
 import org.drools.verifier.dao.VerifierData;
+import org.drools.verifier.report.components.Cause;
 import org.drools.verifier.report.components.VerifierMessage;
 import org.drools.verifier.report.components.VerifierMessageBase;
 import org.drools.verifier.report.components.VerifierRangeCheckMessage;
-import org.drools.verifier.report.components.Cause;
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.templates.TemplateRuntime;
 
 /**
  * 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/ConsequenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/ConsequenceTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/ConsequenceTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -11,9 +11,9 @@
 import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
+import org.drools.verifier.report.components.Severity;
 import org.drools.verifier.report.components.VerifierMessage;
 import org.drools.verifier.report.components.VerifierMessageBase;
-import org.drools.verifier.report.components.Severity;
 
 /**
  *

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/FindMissingNumberTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/FindMissingNumberTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/FindMissingNumberTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -2,8 +2,6 @@
 
 import java.math.BigDecimal;
 
-import org.drools.verifier.FindMissingNumber;
-
 import junit.framework.TestCase;
 
 public class FindMissingNumberTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/PatternSolverTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/PatternSolverTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/PatternSolverTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -3,14 +3,13 @@
 import java.util.List;
 import java.util.Set;
 
-import org.drools.verifier.PatternSolver;
-import org.drools.verifier.components.VerifierComponent;
+import junit.framework.TestCase;
+
 import org.drools.verifier.components.LiteralRestriction;
 import org.drools.verifier.components.OperatorDescr;
 import org.drools.verifier.components.Pattern;
+import org.drools.verifier.components.VerifierComponent;
 
-import junit.framework.TestCase;
-
 /**
  * 
  * @author Toni Rikkola

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/RangeCheckCleanTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/RangeCheckCleanTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/RangeCheckCleanTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -1,24 +1,7 @@
 package org.drools.verifier;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
 import junit.framework.TestCase;
 
-import org.drools.StatelessSession;
-import org.drools.StatelessSessionResult;
-import org.drools.base.RuleNameMatchesAgendaFilter;
-import org.drools.base.evaluators.Operator;
-import org.drools.verifier.components.VerifierComponent;
-import org.drools.verifier.components.Field;
-import org.drools.verifier.components.LiteralRestriction;
-import org.drools.verifier.dao.VerifierResult;
-import org.drools.verifier.dao.VerifierResultFactory;
-import org.drools.verifier.report.components.Gap;
-
 /**
  * 
  * @author Toni Rikkola

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/SolversTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/SolversTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/SolversTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -4,18 +4,17 @@
 import java.util.List;
 import java.util.Set;
 
-import org.drools.verifier.Solvers;
-import org.drools.verifier.components.VerifierRule;
+import junit.framework.TestCase;
+
 import org.drools.verifier.components.LiteralRestriction;
 import org.drools.verifier.components.OperatorDescr;
 import org.drools.verifier.components.Pattern;
 import org.drools.verifier.components.PatternPossibility;
 import org.drools.verifier.components.Restriction;
 import org.drools.verifier.components.RulePossibility;
+import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.report.components.Cause;
 
-import junit.framework.TestCase;
-
 /**
  * 
  * @author Toni Rikkola

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/SubsumptantPossibilitiesRuleTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/SubsumptantPossibilitiesRuleTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/SubsumptantPossibilitiesRuleTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -11,10 +11,10 @@
 import org.drools.StatelessSession;
 import org.drools.StatelessSessionResult;
 import org.drools.base.RuleNameMatchesAgendaFilter;
-import org.drools.verifier.components.VerifierComponent;
 import org.drools.verifier.components.LiteralRestriction;
 import org.drools.verifier.components.PatternPossibility;
 import org.drools.verifier.components.RulePossibility;
+import org.drools.verifier.components.VerifierComponent;
 import org.drools.verifier.report.components.PartialRedundancy;
 import org.drools.verifier.report.components.Redundancy;
 import org.drools.verifier.report.components.Subsumption;

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/TestBase.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/TestBase.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/TestBase.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -16,7 +16,6 @@
 import org.drools.compiler.PackageBuilder;
 import org.drools.lang.descr.PackageDescr;
 import org.drools.rule.Package;
-import org.drools.verifier.PackageDescrFlattener;
 import org.drools.verifier.dao.VerifierData;
 import org.drools.verifier.report.components.Cause;
 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/VerifierTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/VerifierTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/VerifierTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -7,7 +7,6 @@
 import org.drools.RuleBase;
 import org.drools.compiler.DrlParser;
 import org.drools.lang.descr.PackageDescr;
-import org.drools.verifier.Verifier;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.report.components.Severity;
 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/incoherence/IncoherentPatternsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/incoherence/IncoherentPatternsTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/incoherence/IncoherentPatternsTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -11,9 +11,9 @@
 import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
+import org.drools.verifier.report.components.Severity;
 import org.drools.verifier.report.components.VerifierMessage;
 import org.drools.verifier.report.components.VerifierMessageBase;
-import org.drools.verifier.report.components.Severity;
 
 /**
  * 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/incoherence/IncoherentRestrictionsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/incoherence/IncoherentRestrictionsTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/incoherence/IncoherentRestrictionsTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -11,9 +11,9 @@
 import org.drools.verifier.components.Pattern;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
+import org.drools.verifier.report.components.Severity;
 import org.drools.verifier.report.components.VerifierMessage;
 import org.drools.verifier.report.components.VerifierMessageBase;
-import org.drools.verifier.report.components.Severity;
 
 /**
  *

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/missingEquality/MissingEqualityTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/missingEquality/MissingEqualityTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/missingEquality/MissingEqualityTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -11,10 +11,10 @@
 import org.drools.verifier.components.VariableRestriction;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
+import org.drools.verifier.report.components.Cause;
+import org.drools.verifier.report.components.Severity;
 import org.drools.verifier.report.components.VerifierMessage;
 import org.drools.verifier.report.components.VerifierMessageBase;
-import org.drools.verifier.report.components.Cause;
-import org.drools.verifier.report.components.Severity;
 
 public class MissingEqualityTest extends TestBase {
 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/optimisation/PatternOrderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/optimisation/PatternOrderTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/optimisation/PatternOrderTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -10,9 +10,9 @@
 import org.drools.verifier.components.VerifierComponent;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
+import org.drools.verifier.report.components.Severity;
 import org.drools.verifier.report.components.VerifierMessage;
 import org.drools.verifier.report.components.VerifierMessageBase;
-import org.drools.verifier.report.components.Severity;
 
 public class PatternOrderTest extends TestBase {
 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/optimisation/RestrictionOrderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/optimisation/RestrictionOrderTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/optimisation/RestrictionOrderTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -10,17 +10,17 @@
 import org.drools.base.RuleNameMatchesAgendaFilter;
 import org.drools.base.evaluators.Operator;
 import org.drools.verifier.TestBase;
-import org.drools.verifier.components.VerifierComponent;
 import org.drools.verifier.components.LiteralRestriction;
 import org.drools.verifier.components.OperatorDescr;
 import org.drools.verifier.components.Pattern;
 import org.drools.verifier.components.Restriction;
+import org.drools.verifier.components.VerifierComponent;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
+import org.drools.verifier.report.components.Cause;
+import org.drools.verifier.report.components.Severity;
 import org.drools.verifier.report.components.VerifierMessage;
 import org.drools.verifier.report.components.VerifierMessageBase;
-import org.drools.verifier.report.components.Cause;
-import org.drools.verifier.report.components.Severity;
 
 public class RestrictionOrderTest extends TestBase {
 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/overlaps/OverlappingRestrictionsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/overlaps/OverlappingRestrictionsTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/overlaps/OverlappingRestrictionsTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -8,15 +8,15 @@
 import org.drools.base.RuleNameMatchesAgendaFilter;
 import org.drools.base.evaluators.Operator;
 import org.drools.verifier.TestBase;
-import org.drools.verifier.components.VerifierComponent;
 import org.drools.verifier.components.Field;
 import org.drools.verifier.components.LiteralRestriction;
+import org.drools.verifier.components.VerifierComponent;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
+import org.drools.verifier.report.components.Severity;
+import org.drools.verifier.report.components.Subsumption;
 import org.drools.verifier.report.components.VerifierMessage;
 import org.drools.verifier.report.components.VerifierMessageBase;
-import org.drools.verifier.report.components.Severity;
-import org.drools.verifier.report.components.Subsumption;
 
 public class OverlappingRestrictionsTest extends TestBase {
 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/NotesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/NotesTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/NotesTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -11,11 +11,10 @@
 import org.drools.verifier.components.RulePossibility;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
-import org.drools.verifier.report.components.VerifierMessage;
-import org.drools.verifier.report.components.VerifierMessageBase;
 import org.drools.verifier.report.components.Redundancy;
 import org.drools.verifier.report.components.RedundancyType;
 import org.drools.verifier.report.components.Severity;
+import org.drools.verifier.report.components.VerifierMessageBase;
 
 public class NotesTest extends TestBase {
 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/RedundantPossibilitiesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/RedundantPossibilitiesTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/RedundantPossibilitiesTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -9,11 +9,11 @@
 import org.drools.StatelessSessionResult;
 import org.drools.base.RuleNameMatchesAgendaFilter;
 import org.drools.verifier.TestBase;
-import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.components.LiteralRestriction;
 import org.drools.verifier.components.Pattern;
 import org.drools.verifier.components.PatternPossibility;
 import org.drools.verifier.components.RulePossibility;
+import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
 import org.drools.verifier.report.components.Cause;

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/RedundantRulesAndPatternsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/RedundantRulesAndPatternsTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/RedundantRulesAndPatternsTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -9,8 +9,8 @@
 import org.drools.StatelessSessionResult;
 import org.drools.base.RuleNameMatchesAgendaFilter;
 import org.drools.verifier.TestBase;
+import org.drools.verifier.components.TextConsequence;
 import org.drools.verifier.components.VerifierRule;
-import org.drools.verifier.components.TextConsequence;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
 import org.drools.verifier.report.components.Redundancy;

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/WarningsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/WarningsTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/WarningsTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -6,15 +6,14 @@
 import org.drools.StatelessSession;
 import org.drools.base.RuleNameMatchesAgendaFilter;
 import org.drools.verifier.TestBase;
-import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.components.RulePossibility;
+import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
-import org.drools.verifier.report.components.VerifierMessage;
-import org.drools.verifier.report.components.VerifierMessageBase;
 import org.drools.verifier.report.components.Redundancy;
 import org.drools.verifier.report.components.RedundancyType;
 import org.drools.verifier.report.components.Severity;
+import org.drools.verifier.report.components.VerifierMessageBase;
 
 public class WarningsTest extends TestBase {
 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/subsumption/SubsumptantPossibilitiesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/subsumption/SubsumptantPossibilitiesTest.java	2008-10-31 14:28:13 UTC (rev 23650)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/subsumption/SubsumptantPossibilitiesTest.java	2008-10-31 14:35:03 UTC (rev 23651)
@@ -9,11 +9,11 @@
 import org.drools.StatelessSessionResult;
 import org.drools.base.RuleNameMatchesAgendaFilter;
 import org.drools.verifier.TestBase;
-import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.components.LiteralRestriction;
 import org.drools.verifier.components.Pattern;
 import org.drools.verifier.components.PatternPossibility;
 import org.drools.verifier.components.RulePossibility;
+import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.dao.VerifierResult;
 import org.drools.verifier.dao.VerifierResultFactory;
 import org.drools.verifier.report.components.Cause;




More information about the jboss-svn-commits mailing list