November 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3117 - in projects: balalaika and 4 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-11-27 06:08:40 -0500 (Thu, 27 Nov 2008) New Revision: 3117 Added: projects/balalaika/ projects/balalaika/trunk/ projects/balalaika/trunk/Balalaika.ipr projects/balalaika/trunk/Balalaika.iws projects/balalaika/trunk/core/ projects/balalaika/trunk/core/core.iml projects/balalaika/trunk/core/pom.xml projects/balalaika/trunk/core/src/ projects/balalaika/trunk/core/src/main/ projects/balalaika/trunk/core/src/main/java/ projects/balalaika/trunk/parent.iml projects/balalaika/trunk/pom.xml Log: Start BIRT integration project Added: projects/balalaika/trunk/Balalaika.ipr =================================================================== --- projects/balalaika/trunk/Balalaika.ipr (rev 0) +++ projects/balalaika/trunk/Balalaika.ipr 2008-11-27 11:08:40 UTC (rev 3117) @@ -0,0 +1,316 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4" relativePaths="false"> + <component name="AntConfiguration"> + <defaultAnt bundledAnt="true" /> + </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> + <component name="CodeStyleProjectProfileManger"> + <option name="PROJECT_PROFILE" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </component> + <component name="CodeStyleSettingsManager"> + <option name="PER_PROJECT_SETTINGS" /> + <option name="USE_PER_PROJECT_SETTINGS" value="false" /> + </component> + <component name="CompilerConfiguration"> + <option name="DEFAULT_COMPILER" value="Javac" /> + <option name="DEPLOY_AFTER_MAKE" value="0" /> + <resourceExtensions> + <entry name=".+\.(properties|xml|html|dtd|tld)" /> + <entry name=".+\.(gif|png|jpeg|jpg)" /> + </resourceExtensions> + <wildcardResourcePatterns> + <entry name="?*.properties" /> + <entry name="?*.xml" /> + <entry name="?*.gif" /> + <entry name="?*.png" /> + <entry name="?*.jpeg" /> + <entry name="?*.jpg" /> + <entry name="?*.html" /> + <entry name="?*.dtd" /> + <entry name="?*.tld" /> + </wildcardResourcePatterns> + </component> + <component name="DataSourceManagerImpl" /> + <component name="DependenciesAnalyzeManager"> + <option name="myForwardDirection" value="false" /> + </component> + <component name="DependencyValidationManager" /> + <component name="EclipseCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EclipseEmbeddedCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EntryPointsManager"> + <entry_points /> + </component> + <component name="ExportToHTMLSettings"> + <option name="PRINT_LINE_NUMBERS" value="false" /> + <option name="OPEN_IN_BROWSER" value="false" /> + <option name="OUTPUT_DIRECTORY" /> + </component> + <component name="GUI Designer component loader factory" /> + <component name="IdProvider" IDEtalkID="1E46A79AE09FDDA36C7AA36A15233C1A" /> + <component name="InspectionProjectProfileManager"> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <scopes /> + <profiles> + <profile version="1.0" is_locked="false"> + <option name="myName" value="Project Default" /> + <option name="myLocal" value="false" /> + <used_levels> + <error> + <option name="myName" value="ERROR" /> + <option name="myVal" value="400" /> + </error> + <warning> + <option name="myName" value="WARNING" /> + <option name="myVal" value="300" /> + </warning> + <information> + <option name="myName" value="INFO" /> + <option name="myVal" value="200" /> + </information> + <server> + <option name="myName" value="SERVER PROBLEM" /> + <option name="myVal" value="100" /> + </server> + </used_levels> + </profile> + </profiles> + </component> + <component name="JavacSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="DEPRECATION" value="true" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="JavadocGenerationManager"> + <option name="OUTPUT_DIRECTORY" /> + <option name="OPTION_SCOPE" value="protected" /> + <option name="OPTION_HIERARCHY" value="true" /> + <option name="OPTION_NAVIGATOR" value="true" /> + <option name="OPTION_INDEX" value="true" /> + <option name="OPTION_SEPARATE_INDEX" value="true" /> + <option name="OPTION_DOCUMENT_TAG_USE" value="false" /> + <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" /> + <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" /> + <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" /> + <option name="OPTION_DEPRECATED_LIST" value="true" /> + <option name="OTHER_OPTIONS" value="" /> + <option name="HEAP_SIZE" /> + <option name="LOCALE" /> + <option name="OPEN_IN_BROWSER" value="true" /> + </component> + <component name="JikesSettings"> + <option name="JIKES_PATH" value="" /> + <option name="DEBUGGING_INFO" value="true" /> + <option name="DEPRECATION" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="IS_EMACS_ERRORS_MODE" value="true" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + </component> + <component name="LogConsolePreferences"> + <option name="FILTER_ERRORS" value="false" /> + <option name="FILTER_WARNINGS" value="false" /> + <option name="FILTER_INFO" value="true" /> + <option name="CUSTOM_FILTER" /> + </component> + <component name="Maven Reloaded"> + <option name="config"> + <value> + <option name="pluginEnabled" value="false" /> + <option name="offlineModeEnabled" value="false" /> + <option name="updateClasspathsEnabled" value="true" /> + <option name="sortDependenciesEnabled" value="false" /> + <option name="removeDuplicateDependenciesEnabled" value="false" /> + <option name="respondToPomChangesEnabled" value="true" /> + <option name="manageSourceRootsEnabled" value="true" /> + <option name="manageModuleInterdependenciesEnabled" value="true" /> + <option name="downloadSourcesEnabled" value="false" /> + <option name="downloadJavadocEnabled" value="false" /> + <option name="generateSourcesEnabled" value="false" /> + <option name="settingsPath" value="/Users/hbraun/.m2/settings.xml" /> + <option name="searchFilter" value="" /> + <option name="disabledPoms"> + <value> + <collection type="java.util.TreeSet" /> + </value> + </option> + <option name="moduleInterDependencies"> + <value> + <map type="java.util.TreeMap" /> + </value> + </option> + <option name="logLevel" value="1" /> + </value> + </option> + </component> + <component name="Palette2"> + <group name="Swing"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> + </item> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> + <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> + <initial-values> + <property name="text" value="Button" /> + </initial-values> + </item> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="RadioButton" /> + </initial-values> + </item> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="CheckBox" /> + </initial-values> + </item> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="Label" /> + </initial-values> + </item> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> + </group> + </component> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/parent.iml" filepath="$PROJECT_DIR$/parent.iml" /> + </modules> + </component> + <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/target/classes" /> + </component> + <component name="ProjectRunConfigurationManager" /> + <component name="RmicSettings"> + <option name="IS_EANABLED" value="false" /> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="GENERATE_IIOP_STUBS" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + </component> + <component name="StarteamVcsAdapter" /> + <component name="VssVcs" /> + <component name="com.intellij.jsf.UserDefinedFacesConfigs"> + <option name="USER_DEFINED_CONFIGS"> + <value> + <list size="0" /> + </value> + </option> + </component> + <component name="libraryTable" /> + <component name="uidesigner-configuration"> + <option name="INSTRUMENT_CLASSES" value="true" /> + <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> + </component> + <UsedPathMacros /> +</project> + Added: projects/balalaika/trunk/Balalaika.iws =================================================================== --- projects/balalaika/trunk/Balalaika.iws (rev 0) +++ projects/balalaika/trunk/Balalaika.iws 2008-11-27 11:08:40 UTC (rev 3117) @@ -0,0 +1,576 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4" relativePaths="false"> + <component name="BookmarkManager" /> + <component name="ChangeBrowserSettings"> + <option name="MAIN_SPLITTER_PROPORTION" value="0.3" /> + <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" /> + <option name="USE_DATE_BEFORE_FILTER" value="false" /> + <option name="USE_DATE_AFTER_FILTER" value="false" /> + <option name="USE_CHANGE_BEFORE_FILTER" value="false" /> + <option name="USE_CHANGE_AFTER_FILTER" value="false" /> + <option name="DATE_BEFORE" value="" /> + <option name="DATE_AFTER" value="" /> + <option name="CHANGE_BEFORE" value="" /> + <option name="CHANGE_AFTER" value="" /> + <option name="USE_USER_FILTER" value="false" /> + <option name="USER" value="" /> + </component> + <component name="ChangeListManager"> + <list default="true" name="Default" comment="" /> + </component> + <component name="ChangeListSynchronizer" /> + <component name="ChangesViewManager" flattened_view="true" /> + <component name="CheckinPanelState" /> + <component name="Commander"> + <leftPanel /> + <rightPanel /> + <splitter proportion="0.5" /> + </component> + <component name="CompilerWorkspaceConfiguration"> + <option name="COMPILE_IN_BACKGROUND" value="false" /> + <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" /> + <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" /> + <option name="COMPILE_DEPENDENT_FILES" value="false" /> + <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> + <option name="ASSERT_NOT_NULL" value="true" /> + </component> + <component name="CoverageDataManager" /> + <component name="Cvs2Configuration"> + <option name="PRUNE_EMPTY_DIRECTORIES" value="true" /> + <option name="MERGING_MODE" value="0" /> + <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" /> + <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" /> + <option name="RESET_STICKY" value="false" /> + <option name="CREATE_NEW_DIRECTORIES" value="true" /> + <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" /> + <option name="PROCESS_UNKNOWN_FILES" value="false" /> + <option name="PROCESS_DELETED_FILES" value="false" /> + <option name="PROCESS_IGNORED_FILES" value="false" /> + <option name="RESERVED_EDIT" value="false" /> + <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="UPDATE_DATE_OR_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="SHOW_CHANGES_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="SHOW_OUTPUT" value="false" /> + <option name="ADD_WATCH_INDEX" value="0" /> + <option name="REMOVE_WATCH_INDEX" value="0" /> + <option name="UPDATE_KEYWORD_SUBSTITUTION" /> + <option name="MAKE_NEW_FILES_READONLY" value="false" /> + <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" /> + <option name="TAG_AFTER_PROJECT_COMMIT" value="false" /> + <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" /> + <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" /> + <option name="CLEAN_COPY" value="false" /> + </component> + <component name="DaemonCodeAnalyzer"> + <disable_hints /> + </component> + <component name="DebuggerManager"> + <breakpoint_any> + <breakpoint> + <option name="NOTIFY_CAUGHT" value="true" /> + <option name="NOTIFY_UNCAUGHT" value="true" /> + <option name="ENABLED" value="false" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint> + <option name="NOTIFY_CAUGHT" value="true" /> + <option name="NOTIFY_UNCAUGHT" value="true" /> + <option name="ENABLED" value="false" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + </breakpoint_any> + <breakpoint_rules /> + <ui_properties /> + </component> + <component name="ErrorTreeViewConfiguration"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="HIDE_WARNINGS" value="false" /> + </component> + <component name="FavoritesManager"> + <favorites_list name="Balalaika" /> + </component> + <component name="FavoritesProjectViewPane" /> + <component name="FileEditorManager"> + <leaf> + <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="3" column="32" selection-start="281" selection-end="281" vertical-scroll-proportion="0.078431375"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="core.iml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/core/core.iml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/core/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="3" column="23" selection-start="272" selection-end="286" vertical-scroll-proportion="0.078431375"> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> + </component> + <component name="FindManager"> + <FindUsagesManager> + <setting name="OPEN_NEW_TAB" value="false" /> + </FindUsagesManager> + </component> + <component name="HierarchyBrowserManager"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="SORT_ALPHABETICALLY" value="false" /> + <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" /> + </component> + <component name="InspectionManager"> + <option name="AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="SPLITTER_PROPORTION" value="0.5" /> + <option name="GROUP_BY_SEVERITY" value="false" /> + <option name="FILTER_RESOLVED_ITEMS" value="true" /> + <option name="ANALYZE_TEST_SOURCES" value="true" /> + <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" /> + <option name="SCOPE_TYPE" value="1" /> + <option name="CUSTOM_SCOPE_NAME" value="" /> + <option name="SHOW_ONLY_DIFF" value="false" /> + <option name="myCurrentProfileName" value="Default" /> + </component> + <component name="J2EEProjectPane" /> + <component name="JspContextManager" /> + <component name="ModuleEditorState"> + <option name="LAST_EDITED_MODULE_NAME" /> + <option name="LAST_EDITED_TAB_NAME" /> + </component> + <component name="NamedScopeManager" /> + <component name="PackagesPane"> + <subPane> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Balalaika.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </component> + <component name="PerforceChangeBrowserSettings"> + <option name="USE_CLIENT_FILTER" value="true" /> + <option name="CLIENT" value="" /> + </component> + <component name="PerforceDirect.Settings"> + <option name="useP4CONFIG" value="true" /> + <option name="port" value="<perforce_server>:1666" /> + <option name="client" value="" /> + <option name="user" value="" /> + <option name="passwd" value="" /> + <option name="showCmds" value="false" /> + <option name="useNativeApi" value="false" /> + <option name="pathToExec" value="p4" /> + <option name="useCustomPathToExec" value="false" /> + <option name="SYNC_FORCE" value="false" /> + <option name="SYNC_RUN_RESOLVE" value="true" /> + <option name="REVERT_UNCHANGED_FILES" value="true" /> + <option name="CHARSET" value="none" /> + <option name="SHOW_BRANCHES_HISTORY" value="true" /> + <option name="ENABLED" value="true" /> + <option name="USE_LOGIN" value="false" /> + <option name="LOGIN_SILENTLY" value="false" /> + <option name="INTEGRATE_RUN_RESOLVE" value="true" /> + <option name="INTEGRATE_REVERT_UNCHANGED" value="true" /> + <option name="SERVER_TIMEOUT" value="20000" /> + </component> + <component name="ProjectLevelVcsManager"> + <OptionsSetting value="true" id="Add" /> + <OptionsSetting value="true" id="Remove" /> + <OptionsSetting value="true" id="Checkin" /> + <OptionsSetting value="true" id="Checkout" /> + <OptionsSetting value="true" id="Update" /> + <OptionsSetting value="true" id="Status" /> + <OptionsSetting value="true" id="Edit" /> + <OptionsSetting value="true" id="Undo Check Out" /> + <OptionsSetting value="true" id="Compare with SourceSafe Version" /> + <OptionsSetting value="true" id="Get Latest Version" /> + <ConfirmationsSetting value="0" id="Add" /> + <ConfirmationsSetting value="0" id="Remove" /> + </component> + <component name="ProjectPane"> + <subPane> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Balalaika.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="parent" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Balalaika.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="parent" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Balalaika.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="parent" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </component> + <component name="ProjectReloadState"> + <option name="STATE" value="0" /> + </component> + <component name="ProjectView"> + <navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5"> + <flattenPackages /> + <showMembers /> + <showModules /> + <showLibraryContents /> + <hideEmptyPackages /> + <abbreviatePackageNames /> + <showStructure PackagesPane="false" ProjectPane="false" /> + <autoscrollToSource /> + <autoscrollFromSource /> + <sortByType /> + </navigator> + </component> + <component name="PropertiesComponent"> + <property name="MemberChooser.copyJavadoc" value="false" /> + <property name="GoToClass.includeLibraries" value="false" /> + <property name="MemberChooser.showClasses" value="true" /> + <property name="MemberChooser.sorted" value="false" /> + <property name="GoToFile.includeJavaFiles" value="false" /> + <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + </component> + <component name="ReadonlyStatusHandler"> + <option name="SHOW_DIALOG" value="true" /> + </component> + <component name="RecentsManager" /> + <component name="RestoreUpdateTree" /> + <component name="RunManager"> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + </configuration> + <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="" /> + </configuration> + <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> + <configuration name="<template>" type="WebApp" default="true" selected="false"> + <Host>localhost</Host> + <Port>5050</Port> + </configuration> + </component> + <component name="ScopeViewComponent" /> + <component name="SelectInManager" /> + <component name="StarteamConfiguration"> + <option name="SERVER" value="" /> + <option name="PORT" value="49201" /> + <option name="USER" value="" /> + <option name="PASSWORD" value="" /> + <option name="PROJECT" value="" /> + <option name="VIEW" value="" /> + <option name="ALTERNATIVE_WORKING_PATH" value="" /> + <option name="LOCK_ON_CHECKOUT" value="false" /> + <option name="UNLOCK_ON_CHECKIN" value="false" /> + </component> + <component name="StructuralSearchPlugin" /> + <component name="StructureViewFactory"> + <option name="AUTOSCROLL_MODE" value="true" /> + <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> + <option name="ACTIVE_ACTIONS" value="" /> + </component> + <component name="Struts Assistant"> + <option name="showInputs" value="true" /> + <option name="resources"> + <value> + <option name="strutsPath" /> + <option name="strutsHelp" /> + </value> + </option> + <option name="selectedTaglibs" /> + <option name="selectedTaglibs" /> + <option name="myStrutsValidationEnabled" value="true" /> + <option name="myTilesValidationEnabled" value="true" /> + <option name="myValidatorValidationEnabled" value="true" /> + <option name="myReportErrorsAsWarnings" value="true" /> + </component> + <component name="SvnChangesBrowserSettings"> + <option name="USE_AUTHOR_FIELD" value="true" /> + <option name="AUTHOR" value="" /> + <option name="LOCATION" value="" /> + <option name="USE_PROJECT_SETTINGS" value="true" /> + <option name="USE_ALTERNATE_LOCATION" value="false" /> + </component> + <component name="SvnConfiguration"> + <option name="USER" value="" /> + <option name="PASSWORD" value="" /> + <option name="PROCESS_UNRESOLVED" value="false" /> + <option name="LAST_MERGED_REVISION" /> + <option name="UPDATE_RUN_STATUS" value="false" /> + <option name="UPDATE_RECURSIVELY" value="true" /> + <option name="MERGE_DRY_RUN" value="false" /> + </component> + <component name="TodoView" selected-index="0"> + <todo-panel id="selected-file"> + <are-packages-shown value="false" /> + <are-modules-shown value="false" /> + <flatten-packages value="false" /> + <is-autoscroll-to-source value="true" /> + </todo-panel> + <todo-panel id="all"> + <are-packages-shown value="true" /> + <are-modules-shown value="false" /> + <flatten-packages value="false" /> + <is-autoscroll-to-source value="true" /> + </todo-panel> + </component> + <component name="ToolWindowManager"> + <frame x="0" y="22" width="1278" height="774" extended-state="6" /> + <editor active="true" /> + <layout> + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24979658" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> + <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" /> + <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> + <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="4" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> + <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> + </layout> + </component> + <component name="VCS.FileViewConfiguration"> + <option name="SELECTED_STATUSES" value="DEFAULT" /> + <option name="SELECTED_COLUMNS" value="DEFAULT" /> + <option name="SHOW_FILTERS" value="true" /> + <option name="CUSTOMIZE_VIEW" value="true" /> + <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" /> + </component> + <component name="VcsManagerConfiguration"> + <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" /> + <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" /> + <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" /> + <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> + <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> + <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> + <option name="LAST_COMMIT_MESSAGE" /> + <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> + <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> + <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> + <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> + <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> + <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> + <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> + <option name="ERROR_OCCURED" value="false" /> + <option name="ACTIVE_VCS_NAME" /> + <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> + <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> + <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> + </component> + <component name="VssConfiguration"> + <option name="CLIENT_PATH" value="" /> + <option name="SRCSAFEINI_PATH" value="" /> + <option name="USER_NAME" value="" /> + <option name="PWD" value="" /> + <option name="VSS_IS_INITIALIZED" value="true" /> + <CheckoutOptions> + <option name="COMMENT" value="" /> + <option name="DO_NOT_GET_LATEST_VERSION" value="false" /> + <option name="REPLACE_WRITABLE" value="false" /> + <option name="RECURSIVE" value="false" /> + </CheckoutOptions> + <CheckinOptions> + <option name="COMMENT" value="" /> + <option name="KEEP_CHECKED_OUT" value="false" /> + <option name="RECURSIVE" value="false" /> + </CheckinOptions> + <AddOptions> + <option name="STORE_ONLY_LATEST_VERSION" value="false" /> + <option name="CHECK_OUT_IMMEDIATELY" value="false" /> + <option name="FILE_TYPE" value="0" /> + </AddOptions> + <UndocheckoutOptions> + <option name="MAKE_WRITABLE" value="false" /> + <option name="REPLACE_LOCAL_COPY" value="0" /> + <option name="RECURSIVE" value="false" /> + </UndocheckoutOptions> + <GetOptions> + <option name="REPLACE_WRITABLE" value="0" /> + <option name="MAKE_WRITABLE" value="false" /> + <option name="ANSWER_NEGATIVELY" value="false" /> + <option name="ANSWER_POSITIVELY" value="false" /> + <option name="RECURSIVE" value="false" /> + <option name="VERSION" /> + </GetOptions> + <VssConfigurableExcludedFilesTag /> + </component> + <component name="antWorkspaceConfiguration"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="FILTER_TARGETS" value="false" /> + </component> + <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1"> + <option name="myLastEditedConfigurable" /> + </component> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.11111111" version="1"> + <option name="myPlainMode" value="false" /> + <option name="myLastEditedConfigurable" value="parent" /> + </component> + <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> + <option name="myLastEditedConfigurable" /> + </component> + <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/core/core.iml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/core/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="3" column="23" selection-start="272" selection-end="286" vertical-scroll-proportion="0.078431375"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="3" column="32" selection-start="281" selection-end="281" vertical-scroll-proportion="0.078431375"> + <folding /> + </state> + </provider> + </entry> + </component> +</project> + Added: projects/balalaika/trunk/core/core.iml =================================================================== --- projects/balalaika/trunk/core/core.iml (rev 0) +++ projects/balalaika/trunk/core/core.iml 2008-11-27 11:08:40 UTC (rev 3117) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntryProperties /> + </component> +</module> + Added: projects/balalaika/trunk/core/pom.xml =================================================================== --- projects/balalaika/trunk/core/pom.xml (rev 0) +++ projects/balalaika/trunk/core/pom.xml 2008-11-27 11:08:40 UTC (rev 3117) @@ -0,0 +1,39 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>JBoss jBPM3 - Balalaika Core</name> + <groupId>org.jbpm</groupId> + <artifactId>balalaika-core</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + +  + <parent> + <groupId>org.jbpm</groupId> + <artifactId>balalaika-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <properties> + + </properties> + + <dependencies> +  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + +</project> Added: projects/balalaika/trunk/parent.iml =================================================================== --- projects/balalaika/trunk/parent.iml (rev 0) +++ projects/balalaika/trunk/parent.iml 2008-11-27 11:08:40 UTC (rev 3117) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntryProperties /> + </component> +</module> + Added: projects/balalaika/trunk/pom.xml =================================================================== --- projects/balalaika/trunk/pom.xml (rev 0) +++ projects/balalaika/trunk/pom.xml 2008-11-27 11:08:40 UTC (rev 3117) @@ -0,0 +1,64 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>JBoss jBPM3 - Balalaika</name> + <groupId>org.jbpm</groupId> + <artifactId>balalaika-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + +  + <parent> + <groupId>org.jbpm</groupId> + <artifactId>jbpm-parent</artifactId> + <version>1.0.0.GA</version> + </parent> + + <properties> + <commons.logging.version>1.1.1</commons.logging.version> + <junit.version>3.8.1</junit.version> + </properties> + + <modules> + <module>core</module> + </modules> + + <dependencyManagement> + <dependencies> +  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons.logging.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + + </dependencies> + </dependencyManagement> + +  + <repositories> + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + +</project>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3115 - in projects/gwt-console/trunk/server: src/main/java/org/jboss/bpm/console/server/integration/spec and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-27 05:36:03 -0500 (Thu, 27 Nov 2008) New Revision: 3115 Modified: projects/gwt-console/trunk/server/pom.xml projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java Log: Use JBoss Spec API Modified: projects/gwt-console/trunk/server/pom.xml =================================================================== --- projects/gwt-console/trunk/server/pom.xml 2008-11-27 10:26:27 UTC (rev 3114) +++ projects/gwt-console/trunk/server/pom.xml 2008-11-27 10:36:03 UTC (rev 3115) @@ -17,6 +17,11 @@ <relativePath>../pom.xml</relativePath> </parent> +  + <properties> + <jboss.bpm.spec.version>1.0.0-SNAPSHOT</jboss.bpm.spec.version> + </properties> + <dependencies>  <dependency> @@ -42,9 +47,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> - <version>${version}</version> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> + <version>${jboss.bpm.spec.version}</version> <scope>provided</scope> </dependency> Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-11-27 10:26:27 UTC (rev 3114) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-11-27 10:36:03 UTC (rev 3115) @@ -29,17 +29,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.bpm.api.client.Configuration; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.service.ProcessService; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.server.integration.ProcessManagement; -import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Token; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.Process.ProcessStatus; -import org.jbpm.api.service.ProcessDefinitionService; -import org.jbpm.api.service.ProcessService; /** * An implementation that delegates to the jBPM API

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3114 - in jbpm3/trunk/modules/integration: spec and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-27 05:26:27 -0500 (Thu, 27 Nov 2008) New Revision: 3114 Added: jbpm3/trunk/modules/integration/spec/ jbpm3/trunk/modules/integration/spec/.classpath jbpm3/trunk/modules/integration/spec/.project jbpm3/trunk/modules/integration/spec/deploy.sh jbpm3/trunk/modules/integration/spec/pom.xml jbpm3/trunk/modules/integration/spec/scripts/ jbpm3/trunk/modules/integration/spec/src/ Removed: jbpm3/trunk/modules/integration/api/ jbpm3/trunk/modules/integration/spec/.classpath jbpm3/trunk/modules/integration/spec/.project jbpm3/trunk/modules/integration/spec/deploy.sh jbpm3/trunk/modules/integration/spec/pom.xml jbpm3/trunk/modules/integration/spec/scripts/ jbpm3/trunk/modules/integration/spec/src/ Modified: jbpm3/trunk/modules/integration/pom.xml Log: Use JBoss BPM Spec integration Modified: jbpm3/trunk/modules/integration/pom.xml =================================================================== --- jbpm3/trunk/modules/integration/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) +++ jbpm3/trunk/modules/integration/pom.xml 2008-11-27 10:26:27 UTC (rev 3114) @@ -30,7 +30,7 @@  <modules> - <module>api</module> + <module>spec</module> <module>jboss42</module> <module>jboss50</module> </modules> Copied: jbpm3/trunk/modules/integration/spec (from rev 3106, jbpm3/trunk/modules/integration/api) Deleted: jbpm3/trunk/modules/integration/spec/.classpath =================================================================== --- jbpm3/trunk/modules/integration/api/.classpath 2008-11-26 18:01:57 UTC (rev 3106) +++ jbpm3/trunk/modules/integration/spec/.classpath 2008-11-27 10:26:27 UTC (rev 3114) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/cts/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Copied: jbpm3/trunk/modules/integration/spec/.classpath (from rev 3113, jbpm3/trunk/modules/integration/api/.classpath) =================================================================== --- jbpm3/trunk/modules/integration/spec/.classpath (rev 0) +++ jbpm3/trunk/modules/integration/spec/.classpath 2008-11-27 10:26:27 UTC (rev 3114) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/cts/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Deleted: jbpm3/trunk/modules/integration/spec/.project =================================================================== --- jbpm3/trunk/modules/integration/api/.project 2008-11-26 18:01:57 UTC (rev 3106) +++ jbpm3/trunk/modules/integration/spec/.project 2008-11-27 10:26:27 UTC (rev 3114) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jbpm-integration-api</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Copied: jbpm3/trunk/modules/integration/spec/.project (from rev 3113, jbpm3/trunk/modules/integration/api/.project) =================================================================== --- jbpm3/trunk/modules/integration/spec/.project (rev 0) +++ jbpm3/trunk/modules/integration/spec/.project 2008-11-27 10:26:27 UTC (rev 3114) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>bpm-spec-integration-jbpm3</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Deleted: jbpm3/trunk/modules/integration/spec/deploy.sh =================================================================== --- jbpm3/trunk/modules/integration/api/deploy.sh 2008-11-26 18:01:57 UTC (rev 3106) +++ jbpm3/trunk/modules/integration/spec/deploy.sh 2008-11-27 10:26:27 UTC (rev 3114) @@ -1,4 +0,0 @@ -#! /bin/bash - -rm $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans/jbpm-integration-api*.jar -cp target/jbpm-integration-api-3.3.1-SNAPSHOT.jar $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans Copied: jbpm3/trunk/modules/integration/spec/deploy.sh (from rev 3113, jbpm3/trunk/modules/integration/api/deploy.sh) =================================================================== --- jbpm3/trunk/modules/integration/spec/deploy.sh (rev 0) +++ jbpm3/trunk/modules/integration/spec/deploy.sh 2008-11-27 10:26:27 UTC (rev 3114) @@ -0,0 +1,4 @@ +#! /bin/bash + +rm $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans/jbpm-integration-api*.jar +cp target/jbpm-integration-api-3.3.1-SNAPSHOT.jar $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans Deleted: jbpm3/trunk/modules/integration/spec/pom.xml =================================================================== --- jbpm3/trunk/modules/integration/api/pom.xml 2008-11-26 18:01:57 UTC (rev 3106) +++ jbpm3/trunk/modules/integration/spec/pom.xml 2008-11-27 10:26:27 UTC (rev 3114) @@ -1,192 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>JBoss jBPM3 - Integration API</name> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-api</artifactId> - <packaging>jar</packaging> - -  - <parent> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration</artifactId> - <version>3.3.1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - -  - <properties> - <mvel.version>1.3.7-java1.5</mvel.version> - </properties> - -  - <dependencies> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-identity</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-identity</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.mvel</groupId> - <artifactId>mvel</artifactId> - <version>${mvel.version}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-dialect-api10</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-cts</artifactId> - <scope>test</scope> - <type>zip</type> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - <testResource> - <directory>src/cts/resources</directory> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>src/cts</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>assembly-config</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>${project.build.finalName}</finalName> - <appendAssemblyId>true</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-config.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>src/cts</directory> - <directory>src/test</directory> - <includes> - <include>java/org/jbpm/test/cts/**</include> - <include>java/org/jbpm/test/incubator/**</include> - <include>java/org/jbpm/test/pattern/**</include> - </includes> - </fileset> - </filesets> - </configuration> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-cts</artifactId> - <type>zip</type> - </artifactItem> - </artifactItems> - <outputDirectory>src/cts</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>jbpm-cfg-beans.xml</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/jbpm/test/incubator/**/*Test.java</exclude> - <exclude>org/jbpm/test/pattern/**/*Test.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: jbpm3/trunk/modules/integration/spec/pom.xml (from rev 3113, jbpm3/trunk/modules/integration/api/pom.xml) =================================================================== --- jbpm3/trunk/modules/integration/spec/pom.xml (rev 0) +++ jbpm3/trunk/modules/integration/spec/pom.xml 2008-11-27 10:26:27 UTC (rev 3114) @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss jBPM3 - Integration Spec</name> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>bpm-spec-integration-jbpm3</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-integration</artifactId> + <version>3.3.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + +  + <properties> + <mvel.version>1.3.7-java1.5</mvel.version> + </properties> + +  + <dependencies> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-identity</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-identity</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.mvel</groupId> + <artifactId>mvel</artifactId> + <version>${mvel.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-api10</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-cts</artifactId> + <scope>test</scope> + <type>zip</type> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + <testResource> + <directory>src/cts/resources</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-test-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>src/cts</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assembly-config</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>src/cts</directory> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-cts</artifactId> + <type>zip</type> + </artifactItem> + </artifactItems> + <outputDirectory>src/cts</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>jbpm-cfg-beans.xml</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude> + <exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + +</project> Copied: jbpm3/trunk/modules/integration/spec/scripts (from rev 3113, jbpm3/trunk/modules/integration/api/scripts) Copied: jbpm3/trunk/modules/integration/spec/src (from rev 3113, jbpm3/trunk/modules/integration/api/src)

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3113 - in jbpm3/trunk: modules/distribution and 20 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-27 05:25:31 -0500 (Thu, 27 Nov 2008) New Revision: 3113 Added: jbpm3/trunk/modules/integration/api/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider Removed: jbpm3/trunk/modules/integration/api/src/main/resources/org.jbpm.api.client.ConfigurationProvider Modified: jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/trunk/modules/enterprise/jar/pom.xml jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jta/JtaDbPersistenceTest.java jbpm3/trunk/modules/integration/api/.project jbpm3/trunk/modules/integration/api/pom.xml jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/TokenImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/EndEventImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExpressionImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/GatewayImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/StartEventImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/TaskImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/WaitStateImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/ExpressionEvaluator.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/TokenAttachmentDelegate.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/MutableService.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml jbpm3/trunk/modules/integration/api/src/test/java/org/jbpm/test/integration/jpdl/DialectHandlerTest.java jbpm3/trunk/modules/integration/jboss42/pom.xml jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java jbpm3/trunk/pom.xml Log: Use JBoss BPM Spec integration Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -82,12 +82,12 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-api</artifactId> + <artifactId>bpm-spec-integration-jbpm3</artifactId> <version>${version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-api</artifactId> + <artifactId>bpm-spec-integration-jbpm3</artifactId> <classifier>config</classifier> <version>${version}</version> </dependency> @@ -115,12 +115,12 @@ <type>jdocbook</type> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-dialect-api10</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-api10</artifactId> </dependency>  Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -54,7 +54,7 @@ <outputDirectory>resources/jbpm-integration-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:jbpm-integration-api:jar:config</include> + <include>*:bpm-spec-integration-jbpm3:jar:config</include> <include>*:jbpm-integration-jboss42:jar:config</include> </includes> <unpack>true</unpack> Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -141,13 +141,7 @@  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true"> - <include name="jbpm-enterprise-bundle.ear" /> - <include name="jbpm-jpdl.jar" /> - <include name="jbpm-identity.jar" /> - <include name="jbpm-integration-api" /> - <include name="jbpm-integration-jboss42.jar" /> - <include name="jbpm-spec-api.jar" /> - <include name="jsf-console.war" /> + <include name="bpm-spec-api.jar" /> <include name="activation.jar" /> <include name="antlr.jar" /> <include name="asm.jar" /> @@ -158,7 +152,13 @@ <include name="dom4j.jar" /> <include name="hibernate.jar" /> <include name="hsqldb.jar" /> + <include name="jbpm-enterprise-bundle.ear" /> + <include name="jbpm-jpdl.jar" /> + <include name="jbpm-identity.jar" /> + <include name="bpm-spec-integration-jbpm3" /> + <include name="jbpm-integration-jboss42.jar" /> <include name="junit.jar" /> + <include name="jsf-console.war" /> <include name="slf4j-api.jar" /> <include name="slf4j-log4j12.jar" /> <include name="log4j.jar" /> @@ -179,9 +179,9 @@  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans" override="true"> - <include name="jbpm-integration-api.jar" /> - <include name="jbpm-spec-api.jar" /> - <include name="jbpm-spec-dialect-api10.jar" /> + <include name="bpm-spec-api.jar" /> + <include name="bpm-spec-dialect-api10.jar" /> + <include name="bpm-spec-integration-jbpm3.jar" /> </fileset> <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-integration-config" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans/META-INF" override="true"> <include name="jboss-beans.xml" /> Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -85,8 +85,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> <scope>test</scope> </dependency> <dependency> Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -25,7 +25,7 @@ import org.apache.cactus.ServletTestCase; import org.jbpm.JbpmConfiguration; -import org.jbpm.api.test.IntegrationTestSetup; +import org.jboss.bpm.api.test.IntegrationTestSetup; import org.jbpm.msg.jms.JmsMessageServiceFactory; import org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory; import org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory; Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -31,8 +31,8 @@ import junit.framework.TestCase; -import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.api.test.IntegrationTestHelper; +import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.test.IntegrationTestHelper; /** * Test that there are jars deployed which should in fact be provided by the container Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory; import org.jbpm.EventCallback; import org.jbpm.JbpmContext; -import org.jbpm.api.test.IntegrationTestSetup; +import org.jboss.bpm.api.test.IntegrationTestSetup; import org.jbpm.command.Command; import org.jbpm.command.DeployProcessCommand; import org.jbpm.command.StartProcessInstanceCommand; Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory; import org.jbpm.EventCallback; import org.jbpm.JbpmContext; -import org.jbpm.api.test.IntegrationTestSetup; +import org.jboss.bpm.api.test.IntegrationTestSetup; import org.jbpm.command.Command; import org.jbpm.command.DeployProcessCommand; import org.jbpm.command.StartProcessInstanceCommand; Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jta/JtaDbPersistenceTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jta/JtaDbPersistenceTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/jta/JtaDbPersistenceTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -31,7 +31,7 @@ import org.apache.cactus.ServletTestCase; import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; -import org.jbpm.api.test.IntegrationTestSetup; +import org.jboss.bpm.api.test.IntegrationTestSetup; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.persistence.jta.JtaDbPersistenceService; Modified: jbpm3/trunk/modules/integration/api/.project =================================================================== --- jbpm3/trunk/modules/integration/api/.project 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/.project 2008-11-27 10:25:31 UTC (rev 3113) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbpm-integration-api</name> + <name>bpm-spec-integration-jbpm3</name> <comment></comment> <projects> </projects> Modified: jbpm3/trunk/modules/integration/api/pom.xml =================================================================== --- jbpm3/trunk/modules/integration/api/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -15,9 +15,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss jBPM3 - Integration API</name> + <name>JBoss jBPM3 - Integration Spec</name> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-api</artifactId> + <artifactId>bpm-spec-integration-jbpm3</artifactId> <packaging>jar</packaging>  @@ -36,8 +36,8 @@  <dependencies> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> @@ -73,13 +73,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-dialect-api10</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-api10</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-cts</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-cts</artifactId> <scope>test</scope> <type>zip</type> </dependency> @@ -138,12 +138,6 @@ <filesets> <fileset> <directory>src/cts</directory> - <directory>src/test</directory> - <includes> - <include>java/org/jbpm/test/cts/**</include> - <include>java/org/jbpm/test/incubator/**</include> - <include>java/org/jbpm/test/pattern/**</include> - </includes> </fileset> </filesets> </configuration> @@ -159,8 +153,8 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-cts</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-cts</artifactId> <type>zip</type> </artifactItem> </artifactItems> @@ -181,8 +175,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <exclude>org/jbpm/test/incubator/**/*Test.java</exclude> - <exclude>org/jbpm/test/pattern/**/*Test.java</exclude> + <exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude> + <exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude> </excludes> </configuration> </plugin> Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -25,8 +25,8 @@ import java.util.Set; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.service.Service; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.Service; import org.jbpm.integration.service.MutableService; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/TokenImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/TokenImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/client/TokenImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -28,17 +28,17 @@ import javax.management.ObjectName; -import org.jbpm.api.Constants; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Token; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.Process.ProcessStatus; -import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.BasicAttachments; +import org.jboss.bpm.api.Constants; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.BasicAttachments; import org.jbpm.context.exe.ContextInstance; import org.jbpm.integration.model.ProcessImpl; import org.jbpm.integration.runtime.TokenAttachmentDelegate; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -29,10 +29,10 @@ import java.net.URI; import java.net.URL; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.AbstractDialectHandler; -import org.jbpm.api.service.DialectHandler; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.service.AbstractDialectHandler; +import org.jboss.bpm.api.service.DialectHandler; import org.jbpm.integration.model.ProcessDefinitionImpl; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/EndEventImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/EndEventImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/EndEventImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -21,8 +21,8 @@ */ package org.jbpm.integration.model; -import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.EndEvent; +import org.jboss.bpm.api.model.ProcessDefinition; import org.jbpm.graph.node.EndState; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExclusiveGatewayImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,12 +23,12 @@ // $Id$ -import org.jbpm.api.client.Token; -import org.jbpm.api.model.ExclusiveGateway; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.SequenceFlow.ConditionType; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.model.ExclusiveGateway; +import org.jboss.bpm.api.model.Expression; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.SequenceFlow.ConditionType; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.graph.node.Decision; import org.jbpm.graph.node.DecisionHandler; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExpressionImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExpressionImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ExpressionImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,7 +23,7 @@ //$Id$ -import org.jbpm.api.model.Expression; +import org.jboss.bpm.api.model.Expression; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/GatewayImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/GatewayImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/GatewayImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,10 +23,10 @@ import java.util.List; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.Gateway; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.model.Gateway; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.SequenceFlow; import org.jbpm.graph.node.Decision; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -27,13 +27,13 @@ import javax.management.ObjectName; -import org.jbpm.api.Constants; -import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.Constants; +import org.jboss.bpm.api.InvalidProcessException; +import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jbpm.graph.def.Transition; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -29,14 +29,14 @@ import javax.management.ObjectName; -import org.jbpm.api.Constants; -import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.Constants; +import org.jboss.bpm.api.InvalidProcessException; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jbpm.graph.def.Transition; import org.jbpm.graph.node.EndState; import org.jbpm.graph.node.StartState; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -28,17 +28,17 @@ import javax.management.ObjectName; -import org.jbpm.api.Constants; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Token; -import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.Attachments.Key; -import org.jbpm.api.service.ProcessService; +import org.jboss.bpm.api.Constants; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.client.Token.TokenStatus; +import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.builder.ObjectNameFactory; +import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Attachments.Key; +import org.jboss.bpm.api.service.ProcessService; import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.integration.client.TokenImpl; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -21,9 +21,9 @@ */ package org.jbpm.integration.model; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jboss.bpm.api.model.Expression; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.Expression.ExpressionLanguage; import org.jbpm.graph.def.Node; import org.jbpm.graph.def.Transition; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/StartEventImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/StartEventImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/StartEventImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,11 +23,11 @@ import java.util.List; -import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.StartEvent; +import org.jboss.bpm.api.InvalidProcessException; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.StartEvent; import org.jbpm.graph.def.Transition; import org.jbpm.graph.node.StartState; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/TaskImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/TaskImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/TaskImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -24,10 +24,10 @@ import java.util.List; import java.util.Set; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.Task; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.SequenceFlow; +import org.jboss.bpm.api.model.Task; import org.jbpm.graph.def.Node; import org.jbpm.graph.def.Transition; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/WaitStateImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/WaitStateImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/WaitStateImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -21,8 +21,8 @@ */ package org.jbpm.integration.model; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.WaitState; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.WaitState; import org.jbpm.graph.node.State; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/GatewayBuilderImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,9 +23,9 @@ //$Id$ -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.builder.GatewayBuilder; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.model.Expression.ExpressionLanguage; +import org.jboss.bpm.api.model.builder.GatewayBuilder; /** * The GatewayBuilder can be used to build a Gateway dynamically. Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -27,19 +27,19 @@ import java.util.List; import java.util.Set; -import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.Task.TaskType; -import org.jbpm.api.model.builder.GatewayBuilder; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jboss.bpm.api.InvalidProcessException; +import org.jboss.bpm.api.NotImplementedException; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.EndEvent; +import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.StartEvent; +import org.jboss.bpm.api.model.Expression.ExpressionLanguage; +import org.jboss.bpm.api.model.Gateway.GatewayType; +import org.jboss.bpm.api.model.Task.TaskType; +import org.jboss.bpm.api.model.builder.GatewayBuilder; +import org.jboss.bpm.api.model.builder.ProcessBuilder; import org.jbpm.graph.def.Transition; import org.jbpm.graph.node.Decision; import org.jbpm.graph.node.EndState; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/ExpressionEvaluator.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/ExpressionEvaluator.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/ExpressionEvaluator.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -26,11 +26,11 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.api.client.Token; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.Attachments.Key; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.model.Expression; +import org.jboss.bpm.api.model.Expression.ExpressionLanguage; +import org.jboss.bpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Attachments.Key; import org.mvel.MVEL; /** Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,7 +23,7 @@ //$Id$ -import org.jbpm.api.client.Token; +import org.jboss.bpm.api.client.Token; /** * An interceptor that invokes the Node.execute Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.api.client.Token; +import org.jboss.bpm.api.client.Token; /** * A runtime context that passes through a chain of interceptors. Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/TokenAttachmentDelegate.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/TokenAttachmentDelegate.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/runtime/TokenAttachmentDelegate.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -27,7 +27,7 @@ import java.util.HashSet; import java.util.Set; -import org.jbpm.api.runtime.Attachments; +import org.jboss.bpm.api.runtime.Attachments; import org.jbpm.context.exe.ContextInstance; import org.jbpm.integration.client.TokenImpl; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -26,9 +26,9 @@ import java.net.URI; import java.util.Map; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.service.DialectHandler; -import org.jbpm.api.service.DialectHandlerService; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.DialectHandler; +import org.jboss.bpm.api.service.DialectHandlerService; /** * A registry that maps namespaceURI to a {@link DialectHandler} Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/MutableService.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/MutableService.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/MutableService.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,8 +23,8 @@ // $Id$ -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.service.Service; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.service.Service; /** * A mutable service Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -29,12 +29,12 @@ import javax.management.ObjectName; import org.hibernate.Session; -import org.jbpm.api.ProcessNotFoundException; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.PersistenceService; +import org.jboss.bpm.api.ProcessNotFoundException; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.Node; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,10 +23,10 @@ // $Id$ -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; -import org.jbpm.api.service.ProcessBuilderService; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.builder.ProcessBuilder; +import org.jboss.bpm.api.service.ProcessBuilderService; import org.jbpm.integration.model.builder.ProcessBuilderImpl; /** * The ProcessBuilder can be used to build a {@link Process} dynamically. Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -30,12 +30,12 @@ import javax.management.ObjectName; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.service.ProcessService; import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.ProcessDefinitionService; -import org.jbpm.api.service.ProcessService; import org.jbpm.integration.model.ProcessDefinitionImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -33,12 +33,12 @@ import javax.management.ObjectName; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.Process.ProcessStatus; -import org.jbpm.api.service.ProcessDefinitionService; -import org.jbpm.api.service.ProcessService; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.service.ProcessService; import org.jbpm.integration.model.ProcessImpl; import org.jbpm.integration.runtime.NodeInterceptor; import org.slf4j.Logger; Modified: jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -1,31 +1,31 @@  <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">  - <bean name="jBPMKernelLocator" class="org.jbpm.api.client.internal.KernelLocator"> + <bean name="BPMKernelLocator" class="org.jboss.bpm.api.client.internal.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean>  - <bean name="jBPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl"> + <bean name="BPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl"> <property name="services"> - <set elementClass="org.jbpm.api.service.Service"> - <inject bean="jBPMDialectHandlerService"/> - <inject bean="jBPMProcessBuilderService"/> - <inject bean="jBPMProcessDefinitionService"/> - <inject bean="jBPMProcessService"/> + <set elementClass="org.jboss.bpm.api.service.Service"> + <inject bean="BPMDialectHandlerService"/> + <inject bean="BPMProcessBuilderService"/> + <inject bean="BPMProcessDefinitionService"/> + <inject bean="BPMProcessService"/> </set> </property> </bean>  - <bean name="jBPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" /> + <bean name="BPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" />  - <bean name="jBPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl"> + <bean name="BPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl"> <property name="interceptors"> <list elementClass="java.lang.String"> <value>org.jbpm.integration.runtime.NodeExecuteInterceptor</value> @@ -34,19 +34,19 @@ </bean>  - <bean name="jBPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl"> + <bean name="BPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl"> <property name="dialectHandlers"> - <map keyClass="java.net.URI" valueClass="org.jbpm.api.service.DialectHandler"> - <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry> - <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry> + <map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler"> + <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="BPMDialectHandlerAPI10"/></value></entry> + <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="BPMDialectHandlerJPDL32"/></value></entry> </map> </property> </bean> - <bean name="jBPMDialectHandlerAPI10" class="org.jbpm.dialect.api10.DialectHandlerImpl" /> - <bean name="jBPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" /> + <bean name="BPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl" /> + <bean name="BPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" />  - <bean name="jBPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" /> - <bean name="jBPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" /> + <bean name="BPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" /> + <bean name="BPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" /> </deployment> Copied: jbpm3/trunk/modules/integration/api/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider (from rev 3106, jbpm3/trunk/modules/integration/api/src/main/resources/org.jbpm.api.client.ConfigurationProvider) =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider (rev 0) +++ jbpm3/trunk/modules/integration/api/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider 2008-11-27 10:25:31 UTC (rev 3113) @@ -0,0 +1 @@ +org.jboss.bpm.api.client.internal.MicrocontainerConfigurationProvider \ No newline at end of file Deleted: jbpm3/trunk/modules/integration/api/src/main/resources/org.jbpm.api.client.ConfigurationProvider =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/resources/org.jbpm.api.client.ConfigurationProvider 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/main/resources/org.jbpm.api.client.ConfigurationProvider 2008-11-27 10:25:31 UTC (rev 3113) @@ -1 +0,0 @@ -org.jbpm.api.client.internal.MicrocontainerConfigurationProvider \ No newline at end of file Modified: jbpm3/trunk/modules/integration/api/src/test/java/org/jbpm/test/integration/jpdl/DialectHandlerTest.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/test/java/org/jbpm/test/integration/jpdl/DialectHandlerTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/api/src/test/java/org/jbpm/test/integration/jpdl/DialectHandlerTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -25,14 +25,14 @@ import java.net.URL; -import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Token; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.Process.ProcessStatus; -import org.jbpm.api.service.ProcessDefinitionService; -import org.jbpm.api.test.CTSTestCase; +import org.jboss.bpm.api.client.Configuration; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.test.CTSTestCase; /** * Test simple jPDL process deployment Modified: jbpm3/trunk/modules/integration/jboss42/pom.xml =================================================================== --- jbpm3/trunk/modules/integration/jboss42/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/jboss42/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -36,15 +36,15 @@  <dependencies> -  +  <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> </dependency> <dependency> Modified: jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml =================================================================== --- jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -5,27 +5,27 @@ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">  - <bean name="jBPMKernelLocator" class="org.jbpm.api.client.internal.KernelLocator"> + <bean name="BPMKernelLocator" class="org.jboss.bpm.api.client.internal.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean>  - <bean name="jBPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl"> + <bean name="BPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl"> <property name="services"> - <set elementClass="org.jbpm.api.service.Service"> - <inject bean="jBPMDialectHandlerService"/> - <inject bean="jBPMProcessBuilderService"/> - <inject bean="jBPMProcessDefinitionService"/> - <inject bean="jBPMProcessService"/> + <set elementClass="org.jboss.bpm.api.service.Service"> + <inject bean="BPMDialectHandlerService"/> + <inject bean="BPMProcessBuilderService"/> + <inject bean="BPMProcessDefinitionService"/> + <inject bean="BPMProcessService"/> </set> </property> </bean>  - <bean name="jBPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" /> + <bean name="BPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl" />  - <bean name="jBPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl"> + <bean name="BPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl"> <property name="interceptors"> <list elementClass="java.lang.String"> <value>org.jbpm.integration.runtime.NodeExecuteInterceptor</value> @@ -34,19 +34,19 @@ </bean>  - <bean name="jBPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl"> + <bean name="BPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl"> <property name="dialectHandlers"> - <map keyClass="java.net.URI" valueClass="org.jbpm.api.service.DialectHandler"> - <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry> - <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry> + <map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler"> + <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="BPMDialectHandlerAPI10"/></value></entry> + <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="BPMDialectHandlerJPDL32"/></value></entry> </map> </property> </bean> - <bean name="jBPMDialectHandlerAPI10" class="org.jbpm.dialect.api10.DialectHandlerImpl" /> - <bean name="jBPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" /> + <bean name="BPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl" /> + <bean name="BPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl" />  - <bean name="jBPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" /> - <bean name="jBPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" /> + <bean name="BPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" /> + <bean name="BPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" /> </deployment> Modified: jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java =================================================================== --- jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/jboss42/src/main/java/org/jbpm/integration/jboss42/PARSubDeployer.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -30,10 +30,10 @@ import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; import org.jboss.deployment.SubDeployerSupport; -import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.client.Configuration; +import org.jboss.bpm.api.client.ProcessEngine; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.service.ProcessDefinitionService; /** * A deployer service that manages jBPM Process Archive Deployments Modified: jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java =================================================================== --- jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/modules/integration/jboss42/src/test/java/org/jbpm/test/integration/deployment/SimpleDeploymentTest.java 2008-11-27 10:25:31 UTC (rev 3113) @@ -23,7 +23,7 @@ // $Id$ -import org.jbpm.api.test.IntegrationTestCase; +import org.jboss.bpm.api.test.IntegrationTestCase; /** * Test simple jPDL process deployment Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) +++ jbpm3/trunk/pom.xml 2008-11-27 10:25:31 UTC (rev 3113) @@ -65,10 +65,10 @@ <javax.persistence.version>1.0</javax.persistence.version> <javax.jaxb.version>2.1</javax.jaxb.version> <jaxen.version>1.1.1</jaxen.version> - <jbpm.api.version>1.0.0-SNAPSHOT</jbpm.api.version> <jbpm.designer.version>3.1.5</jbpm.designer.version> <jbpm.gwt-console.version>1.0.0-SNAPSHOT</jbpm.gwt-console.version> <jbpm.jsf-console.version>3.3.0.GA</jbpm.jsf-console.version> + <jboss.bpm.spec.version>1.0.0-SNAPSHOT</jboss.bpm.spec.version> <jboss.client.version>4.2.2.GA</jboss.client.version> <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> <jboss.seam.version>2.0.2.GA</jboss.seam.version> @@ -91,22 +91,6 @@ <dependencies>  <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-api</artifactId> - <version>${jbpm.api.version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-dialect-api10</artifactId> - <version>${jbpm.api.version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-cts</artifactId> - <version>${jbpm.api.version}</version> - <type>zip</type> - </dependency> - <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jsf-console</artifactId> <version>${jbpm.jsf-console.version}</version> @@ -131,6 +115,24 @@ <type>zip</type> </dependency> +  + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> + <version>${jboss.bpm.spec.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-api10</artifactId> + <version>${jboss.bpm.spec.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-cts</artifactId> + <version>${jboss.bpm.spec.version}</version> + <type>zip</type> + </dependency> +  <dependency> <groupId>bsh</groupId>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3112 - in projects/spec/trunk: modules/api/src/main/java/org/jboss/bpm/api/client/internal and 3 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-27 04:39:23 -0500 (Thu, 27 Nov 2008) New Revision: 3112 Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/internal/MicrocontainerConfigurationProvider.java projects/spec/trunk/modules/cts/pom.xml projects/spec/trunk/modules/ri/pom.xml projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml projects/spec/trunk/pom.xml Log: Execute CTS eith RI as default impl Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/internal/MicrocontainerConfigurationProvider.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/internal/MicrocontainerConfigurationProvider.java 2008-11-27 09:10:21 UTC (rev 3111) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/internal/MicrocontainerConfigurationProvider.java 2008-11-27 09:39:23 UTC (rev 3112) @@ -40,7 +40,7 @@ public class MicrocontainerConfigurationProvider implements ConfigurationProvider { /** The process engine bean name - jBPMEngine */ - public static final String BEAN_NAME = "jBPMProcessEngine"; + public static final String BEAN_NAME = "BPMProcessEngine"; /** The default bean config: jbpm-cfg-beans.xml */ public static final String JBPM_ENGINE_CONFIG = "jbpm-cfg-beans.xml"; Modified: projects/spec/trunk/modules/cts/pom.xml =================================================================== --- projects/spec/trunk/modules/cts/pom.xml 2008-11-27 09:10:21 UTC (rev 3111) +++ projects/spec/trunk/modules/cts/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) @@ -37,6 +37,26 @@ <artifactId>bpm-spec-api</artifactId> <version>${version}</version> </dependency> + +  + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-api10</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-stp</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-ri</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> </dependencies>  @@ -85,7 +105,10 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <skipTests>true</skipTests> + <excludes> + <exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude> + <exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude> + </excludes> </configuration> </plugin> </plugins> Modified: projects/spec/trunk/modules/ri/pom.xml =================================================================== --- projects/spec/trunk/modules/ri/pom.xml 2008-11-27 09:10:21 UTC (rev 3111) +++ projects/spec/trunk/modules/ri/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) @@ -69,32 +69,6 @@ <artifactId>bpm-spec-api</artifactId> <version>${version}</version> </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-dialect-api10</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-dialect-jpdl32</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-dialect-stp</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-dialect-xpdl21</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-cts</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -112,56 +86,25 @@ <groupId>org.mvel</groupId> <artifactId>mvel</artifactId> </dependency> + +  + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-api10</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-stp</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> </dependencies>  <build> <plugins> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>src/test</directory> - <includes> - <include>java/org/jboss/bpm/test/cts/**</include> - <include>java/org/jboss/bpm/test/incubator/**</include> - <include>java/org/jboss/bpm/test/pattern/**</include> - </includes> - </fileset> - </filesets> - </configuration> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-cts</artifactId> - <type>zip</type> - </artifactItem> - </artifactItems> - <outputDirectory>src/test</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude> - <exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> Modified: projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml =================================================================== --- projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml 2008-11-27 09:10:21 UTC (rev 3111) +++ projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml 2008-11-27 09:39:23 UTC (rev 3112) @@ -2,30 +2,30 @@ xmlns="urn:jboss:bean-deployer:2.0">  - <bean name="WSKernelLocator" class="org.jboss.bpm.api.client.internal.KernelLocator"> + <bean name="BPMKernelLocator" class="org.jboss.bpm.api.client.internal.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean>  - <bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl"> + <bean name="BPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl"> <property name="services"> <set elementClass="org.jboss.bpm.api.service.Service"> - <inject bean="jBPMDialectHandlerService" /> - <inject bean="jBPMMessageService" /> - <inject bean="jBPMMessageBuilderService" /> - <inject bean="jBPMPersistenceService" /> - <inject bean="jBPMProcessBuilderService" /> - <inject bean="jBPMProcessDefinitionService" /> - <inject bean="jBPMProcessService" /> - <inject bean="jBPMSignalService" /> - <inject bean="jBPMSignalBuilderService" /> - <inject bean="jBPMThreadingService" /> + <inject bean="BPMDialectHandlerService" /> + <inject bean="BPMMessageService" /> + <inject bean="BPMMessageBuilderService" /> + <inject bean="BPMPersistenceService" /> + <inject bean="BPMProcessBuilderService" /> + <inject bean="BPMProcessDefinitionService" /> + <inject bean="BPMProcessService" /> + <inject bean="BPMSignalService" /> + <inject bean="BPMSignalBuilderService" /> + <inject bean="BPMThreadingService" /> </set> </property> </bean>  - <bean name="jBPMPersistenceService" class="org.jboss.bpm.ri.service.HibernatePersistenceServiceImpl"> + <bean name="BPMPersistenceService" class="org.jboss.bpm.ri.service.HibernatePersistenceServiceImpl"> <property name="annotatedClasses"> <set elementClass="java.lang.String"> <value>org.jboss.bpm.ri.model.AbstractElementImpl</value> @@ -59,10 +59,10 @@ </set> </property> </bean> -  +   - <bean name="jBPMProcessService" class="org.jboss.bpm.ri.service.ProcessServiceImpl" > + <bean name="BPMProcessService" class="org.jboss.bpm.ri.service.ProcessServiceImpl" > <property name="interceptors"> <list elementClass="java.lang.String"> <value>org.jboss.bpm.ri.runtime.PersistenceSessionInterceptor</value> @@ -76,28 +76,24 @@ </bean>  - <bean name="jBPMDialectHandlerService" class="org.jboss.bpm.ri.service.DialectHandlerServiceImpl" > + <bean name="BPMDialectHandlerService" class="org.jboss.bpm.ri.service.DialectHandlerServiceImpl" > <property name="dialectHandlers"> <map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler"> - <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry> - <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry> - <entry><key>http://stp.eclipse.org/bpmn</key><value><inject bean="jBPMDialectHandlerSTP"/></value></entry> - <entry><key>http://www.wfmc.org/2008/XPDL2.1</key><value><inject bean="jBPMDialectHandlerXPDL21"/></value></entry> + <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="BPMDialectHandlerAPI10"/></value></entry> + <entry><key>http://stp.eclipse.org/bpmn</key><value><inject bean="BPMDialectHandlerSTP"/></value></entry> </map> </property> </bean> - <bean name="jBPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl"/> - <bean name="jBPMDialectHandlerJPDL32" class="org.jboss.bpm.dialect.jpdl32.DialectHandlerImpl"/> - <bean name="jBPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/> - <bean name="jBPMDialectHandlerXPDL21" class="org.jboss.bpm.dialect.xpdl21.DialectHandlerImpl"/> + <bean name="BPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl"/> + <bean name="BPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/>  - <bean name="jBPMMessageService" class="org.jboss.bpm.ri.service.MessageServiceImpl" /> - <bean name="jBPMMessageBuilderService" class="org.jboss.bpm.ri.service.MessageBuilderServiceImpl" /> - <bean name="jBPMProcessBuilderService" class="org.jboss.bpm.ri.service.ProcessBuilderServiceImpl" /> - <bean name="jBPMProcessDefinitionService" class="org.jboss.bpm.ri.service.ProcessDefinitionServiceImpl" /> - <bean name="jBPMSignalBuilderService" class="org.jboss.bpm.ri.service.SignalBuilderServiceImpl" /> - <bean name="jBPMSignalService" class="org.jboss.bpm.ri.service.SignalServiceImpl" /> - <bean name="jBPMThreadingService" class="org.jboss.bpm.ri.service.ThreadingServiceImpl" /> + <bean name="BPMMessageService" class="org.jboss.bpm.ri.service.MessageServiceImpl" /> + <bean name="BPMMessageBuilderService" class="org.jboss.bpm.ri.service.MessageBuilderServiceImpl" /> + <bean name="BPMProcessBuilderService" class="org.jboss.bpm.ri.service.ProcessBuilderServiceImpl" /> + <bean name="BPMProcessDefinitionService" class="org.jboss.bpm.ri.service.ProcessDefinitionServiceImpl" /> + <bean name="BPMSignalBuilderService" class="org.jboss.bpm.ri.service.SignalBuilderServiceImpl" /> + <bean name="BPMSignalService" class="org.jboss.bpm.ri.service.SignalServiceImpl" /> + <bean name="BPMThreadingService" class="org.jboss.bpm.ri.service.ThreadingServiceImpl" /> </deployment> Modified: projects/spec/trunk/pom.xml =================================================================== --- projects/spec/trunk/pom.xml 2008-11-27 09:10:21 UTC (rev 3111) +++ projects/spec/trunk/pom.xml 2008-11-27 09:39:23 UTC (rev 3112) @@ -36,8 +36,8 @@ <module>modules/api</module> <module>modules/dialects</module> <module>modules/ri</module> + <module>modules/cts</module> <module>modules/samples/airticket</module> - <module>modules/cts</module> </modules>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3111 - in projects/spec/trunk/modules/cts/src/test/java/org: jboss and 27 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-27 04:10:21 -0500 (Thu, 27 Nov 2008) New Revision: 3111 Added: projects/spec/trunk/modules/cts/src/test/java/org/jboss/ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/ Removed: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/Foo.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessBuilderTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/executioncontext/ExecutionContextTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/service/signal/SignalMultithreadTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/service/signal/SignalServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequencePersistenceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java Log: Refactor to use JBoss BPM Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm (from rev 3110, projects/spec/trunk/modules/cts/src/test/java/org/jbpm) Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/Foo.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/Foo.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/Foo.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -1,6 +0,0 @@ -package org.jbpm.test; - -public class Foo -{ - -} Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.cts.gateway.exclusive; +package org.jboss.bpm.test.cts.gateway.exclusive; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.cts.gateway.exclusive; +package org.jboss.bpm.test.cts.gateway.exclusive; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/processengine/ProcessEngineTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.cts.processengine; +package org.jboss.bpm.test.cts.processengine; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessBuilderTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessBuilderTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.cts.service.process; +package org.jboss.bpm.test.cts.service.process; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.cts.service.process; +package org.jboss.bpm.test.cts.service.process; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.cts.service.process; +package org.jboss.bpm.test.cts.service.process; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateMarshallerTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateMarshallerTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.cts.task.waitstate; +package org.jboss.bpm.test.cts.task.waitstate; import java.io.IOException; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.cts.task.waitstate; +package org.jboss.bpm.test.cts.task.waitstate; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/endevent/EndEventMessageTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.endevent; +package org.jboss.bpm.test.incubator.endevent; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/executioncontext/ExecutionContextTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/executioncontext/ExecutionContextTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/executioncontext/ExecutionContextTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.executioncontext; +package org.jboss.bpm.test.incubator.executioncontext; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.gateway.exclusive; +package org.jboss.bpm.test.incubator.gateway.exclusive; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.gateway.inclusive; +package org.jboss.bpm.test.incubator.gateway.inclusive; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.gateway.inclusive; +package org.jboss.bpm.test.incubator.gateway.inclusive; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.gateway.parallel; +package org.jboss.bpm.test.incubator.gateway.parallel; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.gateway.parallel; +package org.jboss.bpm.test.incubator.gateway.parallel; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/NodeInputSetTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.node; +package org.jboss.bpm.test.incubator.node; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/NodeOutputSetTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.node; +package org.jboss.bpm.test.incubator.node; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/NodePropertyTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.node; +package org.jboss.bpm.test.incubator.node; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/process/ProcessPropertyTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.process; +package org.jboss.bpm.test.incubator.process; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/service/signal/SignalMultithreadTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/signal/SignalMultithreadTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/service/signal/SignalMultithreadTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.service.signal; +package org.jboss.bpm.test.incubator.service.signal; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/service/signal/SignalServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/signal/SignalServiceTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/service/signal/SignalServiceTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.service.signal; +package org.jboss.bpm.test.incubator.service.signal; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/startevent/StartEventSignalTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.startevent; +package org.jboss.bpm.test.incubator.startevent; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/java/JavaTaskTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.task.java; +package org.jboss.bpm.test.incubator.task.java; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.task.receive; +package org.jboss.bpm.test.incubator.task.receive; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/send/SendTaskTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.task.send; +package org.jboss.bpm.test.incubator.task.send; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/user/UserTaskCallbackTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.task.user; +package org.jboss.bpm.test.incubator.task.user; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/user/UserTaskTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.task.user; +package org.jboss.bpm.test.incubator.task.user; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredMarshallerTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredMarshallerTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.transaction; +package org.jboss.bpm.test.incubator.transaction; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.incubator.transaction; +package org.jboss.bpm.test.incubator.transaction; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.pattern.control.exclusivechoice; +package org.jboss.bpm.test.pattern.control.exclusivechoice; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.pattern.control.multichoice; +package org.jboss.bpm.test.pattern.control.multichoice; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.pattern.control.parallelsplit; +package org.jboss.bpm.test.pattern.control.parallelsplit; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequencePersistenceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequencePersistenceTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.pattern.control.sequence; +package org.jboss.bpm.test.pattern.control.sequence; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.pattern.control.sequence; +package org.jboss.bpm.test.pattern.control.sequence; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.pattern.control.simplemerge; +package org.jboss.bpm.test.pattern.control.simplemerge; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.pattern.control.synchronization; +package org.jboss.bpm.test.pattern.control.synchronization; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.pattern.data.casedata; +package org.jboss.bpm.test.pattern.data.casedata; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-27 08:53:40 UTC (rev 3110) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-27 09:10:21 UTC (rev 3111) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.pattern.data.taskdata; +package org.jboss.bpm.test.pattern.data.taskdata; // $Id$

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3110 - projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-27 03:53:40 -0500 (Thu, 27 Nov 2008) New Revision: 3110 Added: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/Foo.java Log: WIP Added: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/Foo.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/Foo.java (rev 0) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/Foo.java 2008-11-27 08:53:40 UTC (rev 3110) @@ -0,0 +1,6 @@ +package org.jbpm.test; + +public class Foo +{ + +} Property changes on: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/Foo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3109 - projects/spec/trunk/modules/cts/src/test/java/org.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-27 03:34:15 -0500 (Thu, 27 Nov 2008) New Revision: 3109 Removed: projects/spec/trunk/modules/cts/src/test/java/org/jboss/ Log: WIP

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3108 - in projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts: gateway and 1 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-27 03:33:12 -0500 (Thu, 27 Nov 2008) New Revision: 3108 Added: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java Log: WIP Added: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java (rev 0) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-11-27 08:33:12 UTC (rev 3108) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.test.cts.gateway.exclusive; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.service.ProcessDefinitionService; + + +/** + * Exclusive data-based gateway that has conditional outgoing sequence flows. Only one of the gates is taken. It is an + * error if no gate is applicable. + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class ExclusiveGatewaySplitMarshallerTest extends ExclusiveGatewaySplitTest +{ + protected ProcessDefinition getProcessDefinition() throws IOException + { + // Marshall the process to a string + ProcessDefinition procDef = super.getProcessDefinition(); + String procXML = marshallProcess(procDef); + + //System.out.println(procXML); + + // Recreate the ProcessDefinition from the marshalled ProcessDefinition + ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class); + return pdService.parseProcessDefinition(procXML); + } +} Property changes on: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java (rev 0) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-27 08:33:12 UTC (rev 3108) @@ -0,0 +1,113 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.test.cts.gateway.exclusive; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.api.client.Token; +import org.jboss.bpm.api.client.Token.TokenStatus; +import org.jboss.bpm.api.model.Process; +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.Expression.ExpressionLanguage; +import org.jboss.bpm.api.model.Gateway.GatewayType; +import org.jboss.bpm.api.model.Process.ProcessStatus; +import org.jboss.bpm.api.model.builder.GatewayBuilder; +import org.jboss.bpm.api.model.builder.ProcessBuilder; +import org.jboss.bpm.api.runtime.BasicAttachments; +import org.jboss.bpm.api.service.ProcessBuilderService; +import org.jboss.bpm.api.test.CTSTestCase; + +/** + * Exclusive data-based gateway that has conditional outgoing sequence flows. Only one of the gates is taken. It is an + * error if no gate is applicable. + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class ExclusiveGatewaySplitTest extends CTSTestCase +{ + public void testGateA() throws Exception + { + ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); + Process proc = procDef.newInstance(); + + BasicAttachments att = new BasicAttachments(); + att.addAttachment("foo", "5"); + + Token tok = proc.startProcess(att); + + String nodeName = tok.getCurrentNode().getName(); + assertEquals("EndA", nodeName); + + assertEquals(TokenStatus.Destroyed, tok.getTokenStatus()); + assertEquals(ProcessStatus.Completed, proc.getProcessStatus()); + } + + public void testGateB() throws Exception + { + ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); + Process proc = procDef.newInstance(); + + BasicAttachments att = new BasicAttachments(); + att.addAttachment("foo", "15"); + + Token tok = proc.startProcess(att); + + String nodeName = tok.getCurrentNode().getName(); + assertEquals("EndB", nodeName); + + assertEquals(TokenStatus.Destroyed, tok.getTokenStatus()); + assertEquals(ProcessStatus.Completed, proc.getProcessStatus()); + } + + public void testInvalidGate() throws Exception + { + ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); + Process proc = procDef.newInstance(); + + BasicAttachments att = new BasicAttachments(); + att.addAttachment("foo", "10"); + + try + { + proc.startProcess(att); + fail("No gate defined for foo==10"); + } + catch (RuntimeException rte) + { + // expected + } + } + + protected ProcessDefinition getProcessDefinition() throws IOException + { + ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split"); + GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Exclusive); + gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); + gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10"); + procBuilder.addEndEvent("EndA").addEndEvent("EndB"); + return procBuilder.getProcessDefinition(); + } +} Property changes on: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3106 - in jbpm4/trunk/modules: jpdl/src/main/java/org/jbpm/jpdl/deploy and 12 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-11-26 13:01:57 -0500 (Wed, 26 Nov 2008) New Revision: 3106 Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblems.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CheckProblemsBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Problem.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/deploy/ParseJpdlDeployer.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlActivityBinding.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartBinding.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StateBinding.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateId.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateProcess.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CheckVersionBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CreateIdBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CreateProcessBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SaveProcessBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/pvm.wire.bindings.xml jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ProcessTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/StateTest.java jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml Log: deployment parsing error collection Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Deployment.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -57,4 +57,6 @@ ProcessDefinition deploy(); List<ProcessDefinition> deployAll(); + + List<Problem> getProblems(); } Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java (rev 0) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Problem.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm; + +/** + * @author Tom Baeyens + */ +public interface Problem { + + public abstract Throwable getCause(); + + public abstract int getColumn(); + + public abstract int getLine(); + + public abstract String getMsg(); + + public abstract String getResource(); + + public abstract String getSeverity(); + +} \ No newline at end of file Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/deploy/ParseJpdlDeployer.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/deploy/ParseJpdlDeployer.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/deploy/ParseJpdlDeployer.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -41,6 +41,7 @@ // parse them Parse parse = jpdlParser.createParse(); + parse.setProblems(deployment.getProblems()); parse.setInputStream(deployment.getFile(fileName)); parse.execute(); @@ -51,8 +52,6 @@ // add the parsed process definition to the objects // this is where the save process deployer will find it deployment.addObject(fileName, parse.getDocumentObject()); - // add the parse for error logging - deployment.addParse(fileName, parse); } } } Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlActivityBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlActivityBinding.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlActivityBinding.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -21,7 +21,15 @@ */ package org.jbpm.jpdl.xml; +import java.util.List; + +import org.jbpm.jpdl.xml.JpdlParser.UnresolvedTransitions; +import org.jbpm.pvm.internal.model.NodeImpl; +import org.jbpm.pvm.internal.model.TransitionImpl; import org.jbpm.pvm.internal.util.TagBinding; +import org.jbpm.pvm.internal.util.XmlUtil; +import org.jbpm.pvm.internal.xml.Parse; +import org.w3c.dom.Element; /** @@ -32,5 +40,36 @@ public JpdlActivityBinding(String tagName) { super(tagName, "http://jbpm.org/jpdl4", "activity"); } + + public void parseName(Element element, NodeImpl node, Parse parse) { + String name = XmlUtil.attribute(element, "name", isNameRequired(), parse); + + if (name!=null) { + // basic name validation + if ("".equals(name)) { + parse.addProblem(XmlUtil.errorMessageAttribute(element, "name", name, "is empty")); + } else if (name.indexOf('/')!=-1) { + parse.addProblem(XmlUtil.errorMessageAttribute(element, "name", name, "contains slash (/)")); + } + node.setName(name); + } + } + + public boolean isNameRequired() { + return true; + } + + public void parseFlows(Element element, NodeImpl node, Parse parse) { + List<Element> transitionElements = XmlUtil.elements(element, "flow"); + if (transitionElements!=null) { + UnresolvedTransitions unresolvedTransitions = parse.findObject(UnresolvedTransitions.class); + for (Element transitionElement: transitionElements) { + String transitionName = XmlUtil.attribute(transitionElement, "name", false, parse); + TransitionImpl transition = node.createOutgoingTransition(transitionName); + unresolvedTransitions.add(transition, transitionElement); + } + } + } + } Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -77,6 +77,11 @@ processDefinition.setVersion(version); } + String key = XmlUtil.attribute(documentElement, "key", false, parse); + if (key!=null) { + processDefinition.setKey(key); + } + Element descriptionElement = XmlUtil.element(documentElement, "description"); if (descriptionElement!=null) { String description = XmlUtil.getContentText(descriptionElement); @@ -89,12 +94,13 @@ List<Element> elements = XmlUtil.elements(documentElement); if (elements!=null) { for (Element element: elements) { - Binding activityBinding = getBinding(element, "activity"); + JpdlActivityBinding activityBinding = (JpdlActivityBinding) getBinding(element, "activity"); if (activityBinding!=null) { NodeImpl node = (NodeImpl) processDefinition.createNode(); - parseNodeInformation(element, node, parse); parse.pushObject(node); try { + activityBinding.parseName(element, node, parse); + activityBinding.parseFlows(element, node, parse); Activity activity = (Activity) activityBinding.parse(element, parse, this); node.setBehaviour(activity); } finally { @@ -109,7 +115,7 @@ } // TODO remove the initial attribute parsing - String initialNodeName = XmlUtil.attribute(documentElement, "initial", true, parse); + String initialNodeName = XmlUtil.attribute(documentElement, "initial", false, parse); if (initialNodeName!=null) { NodeImpl initial = processDefinition.getNode(initialNodeName); if (initial==null) { @@ -137,30 +143,6 @@ return processDefinition; } - public void parseNodeInformation(Element element, NodeImpl node, Parse parse) { - String name = XmlUtil.attribute(element, "name", true, parse); - - if (name!=null) { - // basic name validation - if ("".equals(name)) { - parse.addProblem(XmlUtil.errorMessageAttribute(element, "name", name, "is empty")); - } else if (name.indexOf('/')!=-1) { - parse.addProblem(XmlUtil.errorMessageAttribute(element, "name", name, "contains slash (/)")); - } - node.setName(name); - } - - List<Element> transitionElements = XmlUtil.elements(element, "flow"); - if (transitionElements!=null) { - UnresolvedTransitions unresolvedTransitions = parse.findObject(UnresolvedTransitions.class); - for (Element transitionElement: transitionElements) { - String transitionName = XmlUtil.attribute(transitionElement, "name", false, parse); - TransitionImpl transition = node.createOutgoingTransition(transitionName); - unresolvedTransitions.add(transition, transitionElement); - } - } - } - static class UnresolvedTransitions { List<UnresolvedTransition> list = new ArrayList<UnresolvedTransition>(); public void add(TransitionImpl transition, Element transitionElement) { Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartBinding.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StartBinding.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -44,4 +44,7 @@ return new StartActivity(); } + public boolean isNameRequired() { + return false; + } } Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StateBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StateBinding.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/StateBinding.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -22,6 +22,8 @@ package org.jbpm.jpdl.xml; import org.jbpm.jpdl.activity.StateActivity; +import org.jbpm.pvm.internal.model.NodeImpl; +import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; import org.w3c.dom.Element; Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -23,7 +23,7 @@ import java.util.List; -import org.jbpm.pvm.internal.xml.Problem; +import org.jbpm.Problem; /** Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -23,7 +23,7 @@ import java.util.List; -import org.jbpm.pvm.internal.xml.Problem; +import org.jbpm.Problem; /** Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -23,9 +23,9 @@ import java.util.List; +import org.jbpm.Problem; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.jpdl.xml.JpdlParser; -import org.jbpm.pvm.internal.xml.Problem; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -23,8 +23,8 @@ import java.util.List; +import org.jbpm.Problem; import org.jbpm.client.ClientProcessDefinition; -import org.jbpm.pvm.internal.xml.Problem; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -23,10 +23,10 @@ import java.util.List; +import org.jbpm.Problem; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.model.Node; import org.jbpm.model.Transition; -import org.jbpm.pvm.internal.xml.Problem; /** Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblems.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblems.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProblems.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.deploy; + +import org.jbpm.JbpmException; +import org.jbpm.pvm.internal.svc.DeploymentImpl; + + +/** + * @author Tom Baeyens + */ +public class CheckProblems implements Deployer { + + public void deploy(DeploymentImpl deployment) { + if (deployment.hasProblems()) { + throw new JbpmException("problems during deployment: "+deployment.getProblemsText()); + } + } + +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckVersion.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -21,7 +21,6 @@ */ package org.jbpm.pvm.internal.deploy; -import org.jbpm.JbpmException; import org.jbpm.ProcessDefinition; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.env.Environment; @@ -43,32 +42,34 @@ for (String objectName : deployment.getObjectNames()) { Object object = deployment.getObject(objectName); if (object instanceof ProcessDefinition) { - checkProcessDefinition((ProcessDefinitionImpl)object); + checkProcessDefinition((ProcessDefinitionImpl)object, deployment); } } } - public void checkProcessDefinition(ProcessDefinitionImpl processDefinition) { + public void checkProcessDefinition(ProcessDefinitionImpl processDefinition, DeploymentImpl deployment) { String name = processDefinition.getName(); if (name == null) { - throw new JbpmException("process must have a name to deploy it"); + deployment.addProblem("process must have a name to deploy it"); } int version = processDefinition.getVersion(); if ( (version==ProcessDefinitionImpl.UNASSIGNED_VERSION) && ! assign ) { - throw new JbpmException("no version specified in process definition "+name); + deployment.addProblem("no version specified in process definition "+name); } Environment environment = Environment.getCurrent(); if (environment==null) { - throw new JbpmException("environment is required by deployer check-version"); + deployment.addProblem("environment is required by deployer check-version"); + return; } PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); if (pvmDbSession==null) { - throw new JbpmException(PvmDbSession.class.getName()+" is required in the environment by "+getClass().getName()); + deployment.addProblem(PvmDbSession.class.getName()+" is required in the environment by "+getClass().getName()); + return; } if ( (version==ProcessDefinitionImpl.UNASSIGNED_VERSION) @@ -85,8 +86,12 @@ } else { if (pvmDbSession.findProcessDefinitionByName(name, version) != null) { - throw new JbpmException("process '" + name + "' version " + version + " already exists"); + deployment.addProblem("process '" + name + "' version " + version + " already exists"); } } } + + public void setAssign(boolean assign) { + this.assign = assign; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateId.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateId.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateId.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -21,7 +21,6 @@ */ package org.jbpm.pvm.internal.deploy; -import org.jbpm.JbpmException; import org.jbpm.ProcessDefinition; import org.jbpm.log.Log; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; @@ -39,12 +38,12 @@ for (String objectName : deployment.getObjectNames()) { Object object = deployment.getObject(objectName); if (object instanceof ProcessDefinition) { - createId((ProcessDefinitionImpl)object); + createId((ProcessDefinitionImpl)object, deployment); } } } - private void createId(ProcessDefinitionImpl processDefinition) { + private void createId(ProcessDefinitionImpl processDefinition, DeploymentImpl deployment) { if (processDefinition.getId()==null) { String key = processDefinition.getKey(); if (key==null) { @@ -52,7 +51,7 @@ } if ("".equals(key)) { - throw new JbpmException("empty string is not a valid key"); + deployment.addProblem("empty string is not a valid key"); } // replace any non-word character with an underscore Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateProcess.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateProcess.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CreateProcess.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -37,12 +37,13 @@ protected Class<?> processDefinitionClass; - public void deploy(DeploymentImpl deploymentImpl) { - ProcessDefinition processDefinition = deploymentImpl.getProcessDefinition(); + public void deploy(DeploymentImpl deployment) { + ProcessDefinition processDefinition = deployment.getProcessDefinition(); if (processDefinition==null) { if (processDefinitionClass==null) { - throw new JbpmException("create-process deployer improperly configured: no class specified"); + deployment.addProblem("create-process deployer improperly configured: no class specified"); + return; } // instantiate @@ -50,14 +51,19 @@ log.trace("creating new "+processDefinitionClass.getName()); processDefinition = (ProcessDefinition) processDefinitionClass.newInstance(); } catch (Exception e) { - throw new JbpmException("couldn't instantiate process definition with class "+processDefinitionClass); + deployment.addProblem("couldn't instantiate process definition with class "+processDefinitionClass+": "+e.toString()); } // make the process definition available in the deployment - deploymentImpl.setProcessDefinition(processDefinition); + deployment.setProcessDefinition(processDefinition); } else { log.trace("using process definition provided in deployment"); } } + + public void setProcessDefinitionClass(Class< ? > processDefinitionClass) { + this.processDefinitionClass = processDefinitionClass; + } + } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveProcess.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -39,14 +39,16 @@ public void deploy(DeploymentImpl deployment) { Environment environment = Environment.getCurrent(); if (environment==null) { - throw new JbpmException("environment is required by "+getClass().getName()); + deployment.addProblem("environment is required by "+getClass().getName()); + return; } PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); if (pvmDbSession==null) { - throw new JbpmException(PvmDbSession.class.getName()+" is required in the environment by "+getClass().getName()); + deployment.addProblem(PvmDbSession.class.getName()+" is required in the environment by "+getClass().getName()); + return; } - + boolean deployedProcess = false; for (String objectName : deployment.getObjectNames()) { Object object = deployment.getObject(objectName); @@ -60,7 +62,6 @@ if (!deployedProcess) { log.info("no process definition in "+deployment); } - } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -36,8 +36,9 @@ import java.util.zip.ZipInputStream; import org.jbpm.Deployment; -import org.jbpm.ProcessDefinition; import org.jbpm.JbpmException; +import org.jbpm.ProcessDefinition; +import org.jbpm.log.Log; import org.jbpm.pvm.internal.stream.ByteArrayStreamSource; import org.jbpm.pvm.internal.stream.FileStreamSource; import org.jbpm.pvm.internal.stream.InputStreamSource; @@ -48,6 +49,8 @@ import org.jbpm.pvm.internal.util.IoUtil; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; +import org.jbpm.pvm.internal.xml.ProblemImpl; +import org.jbpm.pvm.internal.xml.ProblemList; import org.w3c.dom.Document; @@ -57,9 +60,11 @@ * * @author Tom Baeyens */ -public class DeploymentImpl implements Deployment, Serializable { +public class DeploymentImpl extends ProblemList implements Deployment, Serializable { private static final long serialVersionUID = 1L; + + private static final Log log = Log.getLog(DeploymentImpl.class.getName()); private static final Parser parser = new Parser(); @@ -72,20 +77,21 @@ protected Map<String, Document> documents; protected Map<String, Object> objects; - protected List<DeploymentParse> deploymentParses; - protected ProcessDefinition processDefinition; - + public DeploymentImpl(ProcessServiceImpl processServiceImpl) { this.processServiceImpl = processServiceImpl; + this.problems = new ArrayList<ProblemImpl>(); } // TODO REMOVE public DeploymentImpl() { + this.problems = new ArrayList<ProblemImpl>(); } // TODO REMOVE replace with addObject public DeploymentImpl(ProcessDefinition processDefinition) { + this.problems = new ArrayList<ProblemImpl>(); setProcessDefinition(processDefinition); } @@ -316,7 +322,7 @@ return processServiceImpl.deploy(this); } - // error logging + // error logging //////////////////////////////////////////////////////////// public class DeploymentParse { String name; @@ -327,33 +333,6 @@ } } - public void addParse(String name, Parse parse) { - if (deploymentParses==null) { - deploymentParses = new ArrayList<DeploymentParse>(); - } - deploymentParses.add(new DeploymentParse(name, parse)); - } - - public void checkProblems() { - StringBuffer errorMsg = null; - if (deploymentParses!=null) { - boolean hasProblems = false; - for (DeploymentParse deploymentParse: deploymentParses) { - if (deploymentParse.parse.hasProblems()) { - hasProblems = true; - if (errorMsg==null) { - errorMsg = new StringBuffer(); - } - errorMsg.append("problems during parse of "+deploymentParse.name+":"); - errorMsg.append(deploymentParse.parse.logProblems()); - } - } - } - if (errorMsg!=null) { - throw new JbpmException("errors during parsing of "+this+": "+errorMsg); - } - } - public String toString() { if (name!=null) { return "deployment("+name+")"; @@ -367,4 +346,20 @@ } documents.put(name, document); } + + /** throws an exception with appropriate message in case the parse contains + * errors or fatal errors. This method also logs the problems with severity + * 'warning'. */ + public Deployment checkProblems() { + if (hasProblems()) { + String problemsText = getProblemsText(); + if (problemsText!=null) { + String errorMsg = "problems during deployment of "+this+":"+problemsText; + log.info(errorMsg); + throw new JbpmException(errorMsg); + } + } + return this; + } + } Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CheckProblemsBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CheckProblemsBinding.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CheckProblemsBinding.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.wire.binding; + +import org.jbpm.pvm.internal.deploy.CheckProblems; +import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + + +/** + * @author Tom Baeyens + */ +public class CheckProblemsBinding extends WireDescriptorBinding { + + public CheckProblemsBinding() { + super("check-problems"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + CheckProblems checkProblems = new CheckProblems(); + return new ProvidedObjectDescriptor(checkProblems); + } + +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CheckVersionBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CheckVersionBinding.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CheckVersionBinding.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -26,6 +26,7 @@ import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.descriptor.FalseDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; import org.jbpm.pvm.internal.wire.descriptor.TrueDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; @@ -45,19 +46,13 @@ } public Object parse(Element element, Parse parse, Parser parser) { - ObjectDescriptor objectDescriptor = new ObjectDescriptor(CheckVersion.class.getName()); + CheckVersion checkVersion = new CheckVersion(); Boolean assign = XmlUtil.attributeBoolean(element, "assign", false, parse, null); if (assign!=null) { - Descriptor valueDescriptor = null; - if (assign) { - valueDescriptor = new TrueDescriptor(); - } else { - valueDescriptor = new FalseDescriptor(); - } - objectDescriptor.addInjection("assign", valueDescriptor); + checkVersion.setAssign(assign); } - return objectDescriptor; + return new ProvidedObjectDescriptor(checkVersion); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CreateIdBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CreateIdBinding.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CreateIdBinding.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.wire.binding; import org.jbpm.pvm.internal.deploy.CreateId; -import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; import org.w3c.dom.Element; @@ -38,7 +38,8 @@ } public Object parse(Element element, Parse parse, Parser parser) { - return new ObjectDescriptor(CreateId.class); + CreateId createId = new CreateId(); + return new ProvidedObjectDescriptor(createId); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CreateProcessBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CreateProcessBinding.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CreateProcessBinding.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -22,9 +22,11 @@ package org.jbpm.pvm.internal.wire.binding; import org.jbpm.pvm.internal.deploy.CreateProcess; +import org.jbpm.pvm.internal.util.ReflectUtil; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.descriptor.ClassDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; import org.w3c.dom.Element; @@ -43,20 +45,17 @@ } public Object parse(Element element, Parse parse, Parser parser) { - ObjectDescriptor descriptor = new ObjectDescriptor(CreateProcess.class); + CreateProcess createProcess = new CreateProcess(); if (element.hasAttribute("class")) { - ClassDescriptor classDescriptor = new ClassDescriptor(); String className = element.getAttribute("class"); - classDescriptor.setClassName(className); - - descriptor.addInjection("processDefinitionClass", classDescriptor); - + Class<?> processDefinitionClass = ReflectUtil.loadClass(parse.getClassLoader(), className); + createProcess.setProcessDefinitionClass(processDefinitionClass); } else { parse.addProblem("class is a required attribute in "+XmlUtil.toString(element)); } - return descriptor; + return new ProvidedObjectDescriptor(createProcess); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SaveProcessBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SaveProcessBinding.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SaveProcessBinding.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.wire.binding; import org.jbpm.pvm.internal.deploy.SaveProcess; -import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; import org.w3c.dom.Element; @@ -41,6 +41,7 @@ } public Object parse(Element element, Parse parse, Parser parser) { - return new ObjectDescriptor(SaveProcess.class); + SaveProcess saveProcess = new SaveProcess(); + return new ProvidedObjectDescriptor(saveProcess); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -26,8 +26,6 @@ import java.io.InputStream; import java.io.Serializable; import java.net.URL; -import java.util.ArrayList; -import java.util.List; import java.util.ListIterator; import java.util.Stack; @@ -51,11 +49,10 @@ * * @author Tom Baeyens */ -public class Parse implements Serializable, ErrorHandler { +public class Parse extends ProblemList implements Serializable, ErrorHandler { private static Log log = Log.getLog(Parse.class.getName()); private static final long serialVersionUID = 1L; - private static final String NEWLINE = System.getProperty("line.separator"); protected Parser parser; @@ -68,7 +65,6 @@ protected Document document = null; protected Stack<Object> objectStack; - protected List<Problem> problems = null; protected Object documentObject; protected Parse(Parser parser) { @@ -148,69 +144,17 @@ // problems ///////////////////////////////////////////////////////////////// - /** all problems encountered */ - public List<Problem> getProblems() { - return problems; - } - - /** to add parsing problems during XML parsing and DOM walking. */ - public void addProblem(Problem problem) { - if (problems==null) { - problems = new ArrayList<Problem>(); - } - problems.add(problem); - } - - /** add a problem with {@link Problem#SEVERITY_ERROR the default severity}.*/ - public void addProblem(String msg) { - addProblem(msg, null); - } - - /** add a problem with an exception cause and - * {@link Problem#SEVERITY_ERROR the default severity}.*/ - public void addProblem(String msg, Exception e) { - addProblem(msg, e, Problem.SEVERITY_ERROR); - } - - /** adds a problem with {@link Problem#SEVERITY_WARNING severity warning}.*/ - public void addWarning(String msg) { - addWarning(msg, null); - } - - /** adds a problem with {@link Problem#SEVERITY_WARNING severity warning} - * and an exception as the cause.*/ - public void addWarning(String msg, Exception e) { - addProblem(msg, e, Problem.SEVERITY_WARNING); - } - - /** adds a problem given message, exception cause and severity */ - public void addProblem(String msg, Exception e, String severity) { - addProblem(new Problem(msg, e, severity)); - } - - /** indicates presence of problems */ - public boolean hasProblems() { - return ((problems != null) && (problems.size() > 0)); - } - - /** allows to provide the list object that should be used to - * capture the parsing problems. */ - public Parse setProblems(List<Problem> problems) { - this.problems = problems; - return this; - } - /** part of {@link ErrorHandler} to capture XML parsing problems. */ public void error(SAXParseException e) { - addProblem(e.getMessage(), e, Problem.SEVERITY_ERROR); + addProblem(e.getMessage(), e, ProblemImpl.SEVERITY_ERROR); } /** part of {@link ErrorHandler} to capture XML parsing problems. */ public void fatalError(SAXParseException e) { - addProblem(e.getMessage(), e, Problem.SEVERITY_FATALERROR); + addProblem(e.getMessage(), e, ProblemImpl.SEVERITY_FATALERROR); } /** part of {@link ErrorHandler} to capture XML parsing problems. */ public void warning(SAXParseException e) { - addProblem(e.getMessage(), e, Problem.SEVERITY_WARNING); + addProblem(e.getMessage(), e, ProblemImpl.SEVERITY_WARNING); } // contextual objects /////////////////////////////////////////////////////// @@ -264,41 +208,15 @@ * 'warning'. */ public Parse checkProblems(String description) { if (hasProblems()) { - log.info("problems during parse of "+description+":"); - String errorMsg = logProblems(); + String errorMsg = "problems during parse of "+description+":"+getProblemsText(); + log.info(errorMsg); if (errorMsg!=null) { - throw new JbpmException("errors during parsing of "+description+": "+errorMsg); + throw new JbpmException(errorMsg); } } return this; } - public String logProblems() { - String errorMsg = null; - if (problems!=null) { - StringBuffer errorMsgBuffer = null; - for (Problem p : getProblems()) { - if (p.getSeverity().equals(Problem.SEVERITY_ERROR) || p.getSeverity().equals(Problem.SEVERITY_FATALERROR)) { - if (errorMsgBuffer==null) { - errorMsgBuffer = new StringBuffer(); - } - errorMsgBuffer.append(NEWLINE); - errorMsgBuffer.append(" "); - errorMsgBuffer.append(p.toString()); - if (p.getCause()!=null) { - log.error(p.toString(), p.getCause()); - } else { - log.error(p.toString()); - } - } else { - log.info("WARNING: "+p.toString()); - } - } - errorMsg = (errorMsgBuffer!=null ? errorMsgBuffer.toString() : null); - } - return errorMsg; - } - // getters and setters ////////////////////////////////////////////////////// /** the result of this parse operation. */ Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Problem.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Problem.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Problem.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -1,127 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.xml; - -import java.io.Serializable; - -import org.xml.sax.SAXParseException; - -/** - * a unification for an XML parsing errors and DOM interpretation problems, see also {@link Parser}. - * - * See also <a href="./Parser.html#problems">'Problems'</a> - * @author Tom Baeyens - */ -public class Problem implements Serializable { - - private static final long serialVersionUID = 1L; - - public static final String SEVERITY_WARNING = "warning"; - public static final String SEVERITY_ERROR = "error"; - public static final String SEVERITY_FATALERROR = "fatal-error"; - - String resource; - String severity; - Integer line = -1; - Integer column = -1; - String msg; - Throwable cause; - - public Problem(String msg, Exception e, String severity) { - this.severity = severity; - this.msg = msg; - this.cause = e; - if (e instanceof SAXParseException) { - SAXParseException spe = (SAXParseException) e; - this.resource = spe.getPublicId(); - this.line = spe.getLineNumber(); - this.column = spe.getColumnNumber(); - } - } - - public Throwable getCause() { - return cause; - } - public void setCause(Throwable cause) { - this.cause = cause; - } - public int getColumn() { - return column; - } - public void setColumn(int columnNumber) { - this.column = columnNumber; - } - public int getLine() { - return line; - } - public void setLine(int lineNumber) { - this.line = lineNumber; - } - public String getMsg() { - return msg; - } - public void setMsg(String msg) { - this.msg = msg; - } - public String getResource() { - return resource; - } - public void setResource(String resource) { - this.resource = resource; - } - public String getSeverity() { - return severity; - } - public void setSeverity(String severity) { - this.severity = severity; - } - - public String toString() { - StringBuffer text = new StringBuffer(); - text.append(severity); - text.append(" : "); - text.append(msg); - text.append(" "); - - if ((line!=-1) || (column!=-1) || (resource!=null)) { - text.append("["); - if (line!=-1) { - text.append("line="+line+" "); - } - - if (column!=-1) { - text.append("column="+column+" "); - } - - if (resource!=null) { - text.append("resource="+resource+" "); - } - text.append("]"); - } - - if (cause!=null) { - text.append(": " + cause.toString()); - } - - return text.toString(); - } -} Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemImpl.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -0,0 +1,128 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.xml; + +import java.io.Serializable; + +import org.jbpm.Problem; +import org.xml.sax.SAXParseException; + +/** + * a unification for an XML parsing errors and DOM interpretation problems, see also {@link Parser}. + * + * See also <a href="./Parser.html#problems">'Problems'</a> + * @author Tom Baeyens + */ +public class ProblemImpl implements Serializable, Problem { + + private static final long serialVersionUID = 1L; + + public static final String SEVERITY_WARNING = "warning"; + public static final String SEVERITY_ERROR = "error"; + public static final String SEVERITY_FATALERROR = "fatal-error"; + + String resource; + String severity; + Integer line = -1; + Integer column = -1; + String msg; + Throwable cause; + + public ProblemImpl(String msg, Exception e, String severity) { + this.severity = severity; + this.msg = msg; + this.cause = e; + if (e instanceof SAXParseException) { + SAXParseException spe = (SAXParseException) e; + this.resource = spe.getPublicId(); + this.line = spe.getLineNumber(); + this.column = spe.getColumnNumber(); + } + } + + public Throwable getCause() { + return cause; + } + public void setCause(Throwable cause) { + this.cause = cause; + } + public int getColumn() { + return column; + } + public void setColumn(int columnNumber) { + this.column = columnNumber; + } + public int getLine() { + return line; + } + public void setLine(int lineNumber) { + this.line = lineNumber; + } + public String getMsg() { + return msg; + } + public void setMsg(String msg) { + this.msg = msg; + } + public String getResource() { + return resource; + } + public void setResource(String resource) { + this.resource = resource; + } + public String getSeverity() { + return severity; + } + public void setSeverity(String severity) { + this.severity = severity; + } + + public String toString() { + StringBuffer text = new StringBuffer(); + text.append(severity); + text.append(" : "); + text.append(msg); + text.append(" "); + + if ((line!=-1) || (column!=-1) || (resource!=null)) { + text.append("["); + if (line!=-1) { + text.append("line="+line+" "); + } + + if (column!=-1) { + text.append("column="+column+" "); + } + + if (resource!=null) { + text.append("resource="+resource+" "); + } + text.append("]"); + } + + if (cause!=null) { + text.append(": " + cause.toString()); + } + + return text.toString(); + } +} Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -0,0 +1,125 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.xml; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import org.jbpm.Problem; +import org.jbpm.log.Log; +import org.jbpm.pvm.internal.svc.DeploymentImpl; + + +/** list of problems. Base class for {@link Parse} + * and {@link DeploymentImpl}. + * + * @author Tom Baeyens + */ +public class ProblemList implements Serializable { + + private static final long serialVersionUID = 1L; + + private static final String NEWLINE = System.getProperty("line.separator"); + + private static final Log log = Log.getLog(ProblemList.class.getName()); + + protected List<ProblemImpl> problems = null; + + /** all problems encountered */ + public List<Problem> getProblems() { + return (List) problems; + } + + /** to add parsing problems during XML parsing and DOM walking. */ + public void addProblem(ProblemImpl problem) { + if (problems==null) { + problems = new ArrayList<ProblemImpl>(); + } + problems.add(problem); + } + + /** add a problem with {@link ProblemImpl#SEVERITY_ERROR the default severity}.*/ + public void addProblem(String msg) { + addProblem(msg, null); + } + + /** add a problem with an exception cause and + * {@link ProblemImpl#SEVERITY_ERROR the default severity}.*/ + public void addProblem(String msg, Exception e) { + addProblem(msg, e, ProblemImpl.SEVERITY_ERROR); + } + + /** adds a problem with {@link ProblemImpl#SEVERITY_WARNING severity warning}.*/ + public void addWarning(String msg) { + addWarning(msg, null); + } + + /** adds a problem with {@link ProblemImpl#SEVERITY_WARNING severity warning} + * and an exception as the cause.*/ + public void addWarning(String msg, Exception e) { + addProblem(msg, e, ProblemImpl.SEVERITY_WARNING); + } + + /** adds a problem given message, exception cause and severity */ + public void addProblem(String msg, Exception e, String severity) { + addProblem(new ProblemImpl(msg, e, severity)); + } + + /** indicates presence of problems */ + public boolean hasProblems() { + return ((problems != null) && (problems.size() > 0)); + } + + /** allows to provide the list object that should be used to + * capture the parsing problems. */ + public void setProblems(List<Problem> problems) { + this.problems = (List)problems; + } + + + public String getProblemsText() { + String errorMsg = null; + if (problems!=null) { + StringBuffer errorMsgBuffer = null; + for (Problem p : getProblems()) { + if (p.getSeverity().equals(ProblemImpl.SEVERITY_ERROR) || p.getSeverity().equals(ProblemImpl.SEVERITY_FATALERROR)) { + if (errorMsgBuffer==null) { + errorMsgBuffer = new StringBuffer(); + } + errorMsgBuffer.append(NEWLINE); + errorMsgBuffer.append(" "); + errorMsgBuffer.append(p.toString()); + if (p.getCause()!=null) { + log.error(p.toString(), p.getCause()); + } else { + log.error(p.toString()); + } + } else { + log.info("WARNING: "+p.toString()); + } + } + errorMsg = (errorMsgBuffer!=null ? errorMsgBuffer.toString() : null); + } + return errorMsg; + } +} Modified: jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/pvm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/pvm.wire.bindings.xml 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/pvm.wire.bindings.xml 2008-11-26 18:01:57 UTC (rev 3106) @@ -62,6 +62,7 @@ <binding class="org.jbpm.pvm.internal.wire.binding.CheckVersionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.SaveProcessBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.CreateIdBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.CheckProblemsBinding" />   Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/AutoWireTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -23,8 +23,7 @@ import java.util.List; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.xml.Problem; +import org.jbpm.Problem; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/BasicTypeWireTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -23,8 +23,7 @@ import java.util.List; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.xml.Problem; +import org.jbpm.Problem; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -2,8 +2,8 @@ import java.util.List; +import org.jbpm.Problem; import org.jbpm.env.Environment; -import org.jbpm.pvm.internal.xml.Problem; /** * Tests for the ClassDescriptor Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ListWireTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -25,8 +25,7 @@ import java.util.HashSet; import java.util.List; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.xml.Problem; +import org.jbpm.Problem; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MapWireTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -4,8 +4,7 @@ import java.util.Map; import java.util.TreeMap; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.xml.Problem; +import org.jbpm.Problem; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectWireTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -24,9 +24,7 @@ import java.util.List; import org.jbpm.JbpmException; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.wire.WireException; -import org.jbpm.pvm.internal.xml.Problem; +import org.jbpm.Problem; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/PropertiesWireTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -21,16 +21,11 @@ */ package org.jbpm.pvm.internal.wire; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; import java.util.List; import java.util.Properties; +import org.jbpm.Problem; import org.jbpm.pvm.internal.util.FileUtil; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.wire.WireException; -import org.jbpm.pvm.internal.xml.Problem; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/RefWireTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -25,8 +25,7 @@ import java.util.Map; import java.util.Set; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.xml.Problem; +import org.jbpm.Problem; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SetWireTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -3,8 +3,7 @@ import java.util.List; import java.util.Set; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.xml.Problem; +import org.jbpm.Problem; public class SetWireTest extends WireTestCase { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -23,10 +23,8 @@ import java.util.List; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.wire.WireDefinition; +import org.jbpm.Problem; import org.jbpm.pvm.internal.wire.xml.WireParser; -import org.jbpm.pvm.internal.xml.Problem; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -4,12 +4,13 @@ import java.util.List; import org.jbpm.JbpmException; +import org.jbpm.Problem; import org.jbpm.pvm.internal.util.TagBinding; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.xml.Bindings; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; -import org.jbpm.pvm.internal.xml.Problem; +import org.jbpm.pvm.internal.xml.ProblemImpl; import org.jbpm.test.JbpmTestCase; import org.w3c.dom.Element; Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -84,7 +84,7 @@ super.tearDown(); } - public void deployJpdlXmlString(String jpdlXmlString) { + public ProcessDefinition deployJpdlXmlString(String jpdlXmlString) { ProcessDefinition deployedProcessDefinition = processService.createDeployment() .setLanguage("jpdl") @@ -96,5 +96,7 @@ } processDefinitions.add(deployedProcessDefinition); + + return deployedProcessDefinition; } } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ProcessTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ProcessTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ProcessTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -22,6 +22,7 @@ package org.jbpm.test.basicfeatures; import org.jbpm.Execution; +import org.jbpm.ProcessDefinition; import org.jbpm.test.DbTestCase; @@ -61,4 +62,32 @@ assertTrue(execution.isFinished()); assertFalse(execution.isActive()); } + + public void testGivenKey() { + deployJpdlXmlString( + "<process name='minimal' key='M'>" + + " <start />" + + "</process>" + ); + + ProcessDefinition processDefinition = processService.findLatestProcessDefinition("minimal"); + + assertEquals("M", processDefinition.getKey()); + assertEquals("M:1", processDefinition.getId()); + assertEquals(1, processDefinition.getVersion()); + } + + public void testGivenVersion() { + deployJpdlXmlString( + "<process name='minimal' version='23'>" + + " <start />" + + "</process>" + ); + + ProcessDefinition processDefinition = processService.findLatestProcessDefinition("minimal"); + + + assertEquals(23, processDefinition.getVersion()); + assertEquals("minimal:23", processDefinition.getId()); + } } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/StateTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/StateTest.java 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/StateTest.java 2008-11-26 18:01:57 UTC (rev 3106) @@ -22,6 +22,7 @@ package org.jbpm.test.basicfeatures; import org.jbpm.Execution; +import org.jbpm.JbpmException; import org.jbpm.test.DbTestCase; /** @@ -57,14 +58,16 @@ assertTrue(execution.isEnded()); } - /* public void testExternalDecision() { - ClientProcessDefinition processDefinition = parseJpdl( - "<process initial='a' name='p'>" + - " <state name='a'>" + - " <transition name='left' to='b' />" + - " <transition name='middle' to='c' />" + - " <transition name='right' to='d' />" + + deployJpdlXmlString( + "<process name='p'>" + + " <start>" + + " <flow to='ed' />" + + " </start>" + + " <state name='ed'>" + + " <flow name='left' to='b' />" + + " <flow name='middle' to='c' />" + + " <flow name='right' to='d' />" + " </state>" + " <state name='b' />" + " <state name='c' />" + @@ -72,26 +75,30 @@ "</process>" ); - ClientExecution execution = processDefinition.startProcessInstance(); - execution.signal("left"); - assertEquals("b", execution.getNode().getName()); - - execution = processDefinition.startProcessInstance(); - execution.signal("middle"); - assertEquals("c", execution.getNode().getName()); + Execution execution = executionService.startExecution("p:1", "one"); + assertEquals("ed", execution.getNodeName()); + execution = executionService.signalExecution("p:1/one", "left"); + assertEquals("b", execution.getNodeName()); - execution = processDefinition.startProcessInstance(); - execution.signal("right"); - assertEquals("d", execution.getNode().getName()); + executionService.startExecution("p:1", "two"); + execution = executionService.signalExecution("p:1/two", "middle"); + assertEquals("c", execution.getNodeName()); + + executionService.startExecution("p:1", "three"); + execution = executionService.signalExecution("p:1/three", "right"); + assertEquals("d", execution.getNodeName()); } public void testDefaultSignalWithNamedTransitions() { - ClientProcessDefinition processDefinition = parseJpdl( - "<process initial='a' name='p'>" + + deployJpdlXmlString( + "<process name='p'>" + + " <start>" + + " <flow to='a' />" + + " </start>" + " <state name='a'>" + - " <transition name='left' to='b' />" + - " <transition name='middle' to='c' />" + - " <transition name='right' to='d' />" + + " <flow name='left' to='b' />" + + " <flow name='middle' to='c' />" + + " <flow name='right' to='d' />" + " </state>" + " <state name='b' />" + " <state name='c' />" + @@ -99,14 +106,15 @@ "</process>" ); - ClientExecution execution = processDefinition.startProcessInstance(); + executionService.startExecution("p:1", "one"); try { - execution.signal(); - } catch (PvmException e) { + executionService.signalExecution("p:1/one", "left"); + } catch (JbpmException e) { assertTextPresent("no matching transition or event for default signal in state(a)", e.getMessage()); } } + /* public void testNamedSignalWithoutMatchingTransition() { ClientProcessDefinition processDefinition = parseJpdl( "<process initial='a' name='p'>" + Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2008-11-26 17:08:16 UTC (rev 3105) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2008-11-26 18:01:57 UTC (rev 3106) @@ -9,6 +9,7 @@ <parse-jpdl /> <check-version /> <create-id /> + <check-problems /> <save-process /> </language> </deployer-manager>

17 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits November 2008