[seam/config] 2f3b8d: Move Seam Config to use seam solder rather than we...
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/seam/config
Commit: 2f3b8deab667726ca21f49552082860166e6b47d
https://github.com/seam/config/commit/2f3b8deab667726ca21f49552082860166e...
Author: Stuart Douglas <stuart.w.douglas(a)gmail.com>
Date: 2010-12-08 (Wed, 08 Dec 2010)
Changed paths:
M docs/src/main/docbook/en-US/introduction.xml
M examples/princess-rescue/pom.xml
M pom.xml
M providers/xml/pom.xml
M providers/xml/src/main/java/org/jboss/seam/config/xml/bootstrap/ResourceLoaderXmlDocumentProvider.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/bootstrap/XmlConfigExtension.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/core/BeanResult.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/fieldset/ArrayFieldSet.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/fieldset/CollectionFieldSet.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/fieldset/ELFieldValue.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/fieldset/MapFieldSet.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/fieldset/SimpleFieldValue.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/model/AnnotationUtils.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/model/ClassXmlItem.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/model/PropertyXmlItem.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/parser/namespace/PackageNamespaceElementResolver.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/parser/namespace/RootNamespaceElementResolver.java
M providers/xml/src/main/java/org/jboss/seam/config/xml/util/PropertyUtils.java
M providers/xml/src/test/java/org/jboss/seam/config/xml/test/fieldset/Knight.java
M providers/xml/src/test/java/org/jboss/seam/config/xml/test/simple/Bean3.java
Log Message:
-----------
Move Seam Config to use seam solder rather than weld extentsions
14 years
[seam/forge] a7a748: fixed author tags
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/seam/forge
Commit: a7a7481b74ee1d50b20de1631e4c6915fa490672
https://github.com/seam/forge/commit/a7a7481b74ee1d50b20de1631e4c6915fa49...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
M project-model/src/main/java/org/jboss/seam/forge/project/resources/VirtualResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaFieldResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaMethodResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaResource.java
Log Message:
-----------
fixed author tags
14 years
[seam/forge] 9922b9: fix to quote parsing.
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/seam/forge
Commit: 9922b91f0bd34d03acbc93bf068dad37448e69a1
https://github.com/seam/forge/commit/9922b91f0bd34d03acbc93bf068dad37448e...
Author: Mike Brock <brockm(a)gmail.com>
Date: 2010-12-06 (Mon, 06 Dec 2010)
Changed paths:
M dist/pom.xml
A persistence-plugin/src/main/java/org/jboss/seam/forge/persistence/NewEntityPlugin.java
A persistence-plugin/src/main/java/org/jboss/seam/forge/persistence/NewFieldPlugin.java
M persistence-plugin/src/main/java/org/jboss/seam/forge/persistence/PersistenceFacet.java
R persistence-plugin/src/main/java/org/jboss/seam/forge/persistence/plugins/LastEntity.java
R persistence-plugin/src/main/java/org/jboss/seam/forge/persistence/plugins/NewEntityPlugin.java
R persistence-plugin/src/main/java/org/jboss/seam/forge/persistence/plugins/NewFieldPlugin.java
M persistence-plugin/src/test/java/org/jboss/seam/forge/persistence/test/plugins/NewEntityPluginTest.java
M persistence-plugin/src/test/java/org/jboss/seam/forge/persistence/test/plugins/NewFieldPluginNegativeTest.java
M persistence-plugin/src/test/java/org/jboss/seam/forge/persistence/test/plugins/NewFieldPluginTest.java
M persistence-plugin/src/test/java/org/jboss/seam/forge/persistence/test/plugins/util/AbstractJPATest.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/JavaSourceFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/ResourceFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/WebResourceFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/builtin/MavenCoreFacetImpl.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/builtin/MavenJavaSourceFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/builtin/MavenResourceFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/builtin/MavenWebResourceFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/FileResource.java
A project-model/src/main/java/org/jboss/seam/forge/project/resources/ResourceException.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/DirectoryResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/UnknownFileResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/services/ProjectFactory.java
M project-model/src/main/java/org/jboss/seam/forge/project/services/ResourceFactory.java
A project-model/src/main/java/org/jboss/seam/forge/project/util/OSUtils.java
M project-model/src/test/java/org/jboss/seam/forge/test/project/MavenFacetsTest.java
M project-model/src/test/java/org/jboss/seam/forge/test/project/facets/impl/MavenJavaSourceFacetImplTest.java
M project-model/src/test/java/org/jboss/seam/forge/test/project/resources/ResourceAPITests.java
M shell/src/main/java/org/jboss/seam/forge/shell/command/PluginRegistry.java
M shell/src/main/java/org/jboss/seam/forge/shell/command/fshparser/FSHParser.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/NewProjectPlugin.java
M shell/src/test/java/org/jboss/seam/forge/shell/test/plugins/builtin/ChangeDirectoryPluginTest.java
M test-harness/src/main/java/org/jboss/seam/forge/test/SingletonAbstractShellTest.java
Log Message:
-----------
fix to quote parsing.
Commit: b6d1bcab4a9f0246d05a137a07ca814a3618c238
https://github.com/seam/forge/commit/b6d1bcab4a9f0246d05a137a07ca814a3618...
Author: Mike Brock <brockm(a)gmail.com>
Date: 2010-12-06 (Mon, 06 Dec 2010)
Changed paths:
M project-model/src/main/java/org/jboss/seam/forge/project/resources/FileResource.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/ConcatenatePlugin.java
Log Message:
-----------
use BufferedInputStream
Commit: 998af60fa317aaa80f26f38f69141a03f0d6a623
https://github.com/seam/forge/commit/998af60fa317aaa80f26f38f69141a03f0d6...
Author: Aslak Knutsen <aslak(a)redhat.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
A project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/maven/MavenDependencyResource.java
A project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/maven/MavenPomResource.java
A project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/maven/MavenProfileResource.java
A project-model/src/test/java/org/jboss/seam/forge/project/resources/builtin/maven/MavenPomResourceTestCase.java
A shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/LsMavenPomPlugin.java
A shell/src/test/java/org/jboss/seam/forge/shell/test/plugins/builtin/LsMavenPomPluginTestCase.java
Log Message:
-----------
Add Maven Resource support
- CD into a Maven pom.xml file
- List Dependencies
Commit: f5f9eb98c8c9b01190f1cfa0b93e380f79a361d5
https://github.com/seam/forge/commit/f5f9eb98c8c9b01190f1cfa0b93e380f79a3...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
R project-model/src/main/java/org/jboss/seam/forge/project/resources/ClassMemberResource.java
A project-model/src/main/java/org/jboss/seam/forge/project/resources/VirtualResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaFieldResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaMethodResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/maven/MavenDependencyResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/maven/MavenPomResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/maven/MavenProfileResource.java
Log Message:
-----------
Updated maven resources to utilize VirtualResource, compiles
Commit: ea59cf8136d7c028e6a170a37e30a7ead042bef0
https://github.com/seam/forge/commit/ea59cf8136d7c028e6a170a37e30a7ead042...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
M project-model/src/main/java/org/jboss/seam/forge/project/resources/FileResource.java
M shell-api/src/main/java/org/jboss/seam/forge/shell/Shell.java
M shell/src/main/java/org/jboss/seam/forge/shell/ShellImpl.java
M shell/src/main/java/org/jboss/seam/forge/shell/command/CommandLibraryExtension.java
M shell/src/main/java/org/jboss/seam/forge/shell/command/CommandMetadata.java
M shell/src/main/java/org/jboss/seam/forge/shell/command/Execution.java
M shell/src/main/java/org/jboss/seam/forge/shell/command/ExecutionParser.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/LsJavaPlugin.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/LsMavenPomPlugin.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/LsPlugin.java
M test-harness/src/main/java/org/jboss/seam/forge/test/AbstractShellTest.java
Log Message:
-----------
Fixed swallowed exception in Execution. Updated thrown exceptions in FileResource
Commit: 51d68d1b28b368745033607af7b117c3b650d5e6
https://github.com/seam/forge/commit/51d68d1b28b368745033607af7b117c3b650...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/maven/MavenPomResource.java
M shell/src/main/java/org/jboss/seam/forge/shell/command/Execution.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/ChangeDirectoryPlugin.java
Log Message:
-----------
further exception propagation, cd now accepts virtual resources, mvnpomresource now always returns a child
Commit: c24a1ee7339bb7b134042b39d2d687400e64a2b5
https://github.com/seam/forge/commit/c24a1ee7339bb7b134042b39d2d687400e64...
Author: Mike Brock <brockm(a)gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
M project-model/src/main/java/org/jboss/seam/forge/project/util/PathspecParser.java
M project-model/src/test/java/org/jboss/seam/forge/test/project/resources/ResourceAPITests.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/GrepPlugin.java
Log Message:
-----------
fix pathspec parser
Commit: 3889c507156aeaacd6582c1ee88121ff6c5fc151
https://github.com/seam/forge/commit/3889c507156aeaacd6582c1ee88121ff6c5f...
Author: Mike Brock <brockm(a)gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
M project-model/src/main/java/org/jboss/seam/forge/project/util/PathspecParser.java
Log Message:
-----------
fix pathspec parser
Commit: 6b1003eb446f8060aa781213c820fc100ea450c5
https://github.com/seam/forge/commit/6b1003eb446f8060aa781213c820fc100ea4...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
M project-model/src/main/java/org/jboss/seam/forge/project/AbstractResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/Resource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/FileResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/VirtualResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/maven/MavenPomResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/util/PathspecParser.java
Log Message:
-----------
updates for resource handling
Commit: f9e31209f9a58ae88dcf9656cc73b7de06344973
https://github.com/seam/forge/commit/f9e31209f9a58ae88dcf9656cc73b7de0634...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
M persistence-plugin/src/main/java/org/jboss/seam/forge/persistence/NewEntityPlugin.java
M persistence-plugin/src/main/java/org/jboss/seam/forge/persistence/NewFieldPlugin.java
M persistence-plugin/src/main/java/org/jboss/seam/forge/persistence/PersistenceFacet.java
M persistence-plugin/src/test/java/org/jboss/seam/forge/persistence/test/plugins/NewFieldPluginNegativeTest.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/ResourceFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/WebResourceFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/builtin/MavenCoreFacetImpl.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/builtin/MavenJavaSourceFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/facets/builtin/MavenResourceFacet.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/FileResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/DirectoryResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/services/ProjectFactory.java
M project-model/src/main/java/org/jboss/seam/forge/project/services/ResourceFactory.java
M project-model/src/main/java/org/jboss/seam/forge/project/util/PathspecParser.java
M project-model/src/test/java/org/jboss/seam/forge/test/project/MavenFacetsTest.java
M project-model/src/test/java/org/jboss/seam/forge/test/project/facets/impl/MavenJavaSourceFacetImplTest.java
M project-model/src/test/java/org/jboss/seam/forge/test/project/resources/ResourceAPITests.java
M shell/src/main/java/org/jboss/seam/forge/shell/command/PluginRegistry.java
M shell/src/main/java/org/jboss/seam/forge/shell/command/fshparser/FSHParser.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/ConcatenatePlugin.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/GrepPlugin.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/NewProjectPlugin.java
M test-harness/src/main/java/org/jboss/seam/forge/test/SingletonAbstractShellTest.java
Log Message:
-----------
merged from mike
Commit: ee047c4b45d43c2221399b3e0f16721239e2e16e
https://github.com/seam/forge/commit/ee047c4b45d43c2221399b3e0f16721239e2...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
M parser-java/src/main/java/org/jboss/seam/forge/parser/java/Method.java
M parser-java/src/main/java/org/jboss/seam/forge/parser/java/Parameter.java
M parser-java/src/main/java/org/jboss/seam/forge/parser/java/impl/ParameterImpl.java
M parser-java/src/test/java/org/jboss/seam/forge/test/grammar/java/MethodTest.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaFieldResource.java
A project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaMemberResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaMethodResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/JavaResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/maven/MavenDependencyResource.java
M project-model/src/main/java/org/jboss/seam/forge/project/util/PathspecParser.java
M shell-api/src/main/java/org/jboss/seam/forge/shell/ShellPrintWriter.java
M shell-api/src/main/java/org/jboss/seam/forge/shell/color/JavaColorizer.java
M shell-api/src/main/java/org/jboss/seam/forge/shell/plugins/PipeOut.java
M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/LsJavaPlugin.java
Log Message:
-----------
Updated JavaResource API to support Field and Method resources, updated ShellPrintWriter API with renderColor() method.
14 years
[seam/servlet] 80da30: move docs/reference to docs
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/seam/servlet
Commit: 80da30021bef27fb3f92bb4e077972bcbc8a7db0
https://github.com/seam/servlet/commit/80da30021bef27fb3f92bb4e077972bcbc...
Author: Dan Allen <dan.j.allen(a)gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)
Changed paths:
A docs/pom.xml
A docs/readme.md
R docs/reference/pom.xml
R docs/reference/readme.md
R docs/reference/src/main/assembly/assembly.xml
R docs/reference/src/main/docbook/en-US/author_group.xml
R docs/reference/src/main/docbook/en-US/beanmanager.xml
R docs/reference/src/main/docbook/en-US/book_info.xml
R docs/reference/src/main/docbook/en-US/events.xml
R docs/reference/src/main/docbook/en-US/exception_handling.xml
R docs/reference/src/main/docbook/en-US/injectable_refs.xml
R docs/reference/src/main/docbook/en-US/installation.xml
R docs/reference/src/main/docbook/en-US/introduction.xml
R docs/reference/src/main/docbook/en-US/master.xml
A docs/src/main/assembly/assembly.xml
A docs/src/main/docbook/en-US/author_group.xml
A docs/src/main/docbook/en-US/beanmanager.xml
A docs/src/main/docbook/en-US/book_info.xml
A docs/src/main/docbook/en-US/events.xml
A docs/src/main/docbook/en-US/exception_handling.xml
A docs/src/main/docbook/en-US/injectable_refs.xml
A docs/src/main/docbook/en-US/installation.xml
A docs/src/main/docbook/en-US/introduction.xml
A docs/src/main/docbook/en-US/master.xml
M pom.xml
Log Message:
-----------
move docs/reference to docs
14 years
Seam SVN: r13937 - in branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam: navigation and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-12-07 11:14:11 -0500 (Tue, 07 Dec 2010)
New Revision: 13937
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcess.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/TaskControl.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/pageflow/Page.java
Log:
JBPAPP-5517 added exception handling in case of EL expresion fails in jbpm process definition
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcess.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcess.java 2010-12-07 09:30:29 UTC (rev 13936)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcess.java 2010-12-07 16:14:11 UTC (rev 13937)
@@ -15,6 +15,8 @@
import org.jboss.seam.core.Events;
import org.jboss.seam.international.StatusMessage;
import org.jboss.seam.international.StatusMessages;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.taskmgmt.exe.TaskInstance;
@@ -32,7 +34,8 @@
@Install(dependencies="org.jboss.seam.bpm.jbpm", precedence=BUILT_IN)
public class BusinessProcess extends AbstractMutable implements Serializable
{
-
+ private static final LogProvider log = Logging.getLogProvider(BusinessProcess.class);
+
private static final long serialVersionUID = 4722350870845851070L;
private Long processId;
private Long taskId;
@@ -192,7 +195,7 @@
*
* @param transitionName the jBPM transition name, or null
*/
- public void endTask(String transitionName)
+ public void endTask(String transitionName) throws Exception
{
TaskInstance task = org.jboss.seam.bpm.TaskInstance.instance();
if (task==null)
@@ -205,13 +208,22 @@
transitionName = Transition.instance().getName();
}
- if (transitionName==null)
+ try
{
- task.end();
+ if (transitionName==null)
+ {
+ task.end();
+ }
+ else
+ {
+ task.end(transitionName);
+ }
}
- else
- {
- task.end(transitionName);
+ catch (Exception e) {
+ log.debug("Exception while ending bussiness task!");
+ processId = null;
+ taskId = null;
+ throw new RuntimeException(e);
}
setTaskId(null); //TODO: do I really need this???!
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java 2010-12-07 09:30:29 UTC (rev 13936)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/bpm/BusinessProcessInterceptor.java 2010-12-07 16:14:11 UTC (rev 13937)
@@ -25,6 +25,7 @@
import org.jboss.seam.log.Logging;
import org.jboss.seam.util.Strings;
import org.jboss.seam.web.Parameters;
+import org.jbpm.JbpmContext;
/**
* Implements annotation-based business-process demarcation.
@@ -120,7 +121,20 @@
if ( method.isAnnotationPresent(EndTask.class) )
{
log.trace( "encountered @EndTask" );
- BusinessProcess.instance().endTask( method.getAnnotation(EndTask.class).transition() );
+ try
+ {
+ BusinessProcess.instance().endTask( method.getAnnotation(EndTask.class).transition() );
+ }
+ catch (Exception e) {
+ log.debug("Closing JBPM context because exception(s) was thrown!");
+ Contexts.getBusinessProcessContext().flush();
+ throw new RuntimeException(e);
+ }
+ finally
+ {
+ ManagedJbpmContext.instance().close();
+ }
+
}
if ( method.isAnnotationPresent(org.jboss.seam.annotations.bpm.Transition.class) )
{
@@ -131,7 +145,7 @@
}
}
return result;
- }
+ }
private String getProcessKey(String el)
{
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/TaskControl.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/TaskControl.java 2010-12-07 09:30:29 UTC (rev 13936)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/TaskControl.java 2010-12-07 16:14:11 UTC (rev 13937)
@@ -1,10 +1,16 @@
package org.jboss.seam.navigation;
import org.jboss.seam.bpm.BusinessProcess;
+import org.jboss.seam.bpm.ManagedJbpmContext;
+import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Expressions.ValueExpression;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
public class TaskControl
{
+
+ private static final LogProvider log = Logging.getLogProvider(TaskControl.class);
private boolean isBeginTask;
@@ -21,7 +27,19 @@
if ( endTask() )
{
BusinessProcess.instance().validateTask();
- BusinessProcess.instance().endTask(transition == null ? null : transition.getValue());
+ try
+ {
+ BusinessProcess.instance().endTask(transition == null ? null : transition.getValue());
+ }
+ catch (Exception e) {
+ log.debug("Closing JBPM context because exception(s) was thrown!");
+ Contexts.getBusinessProcessContext().flush();
+ throw new RuntimeException(e);
+ }
+ finally
+ {
+ ManagedJbpmContext.instance().close();
+ }
}
if ( beginTask() || startTask() )
{
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/pageflow/Page.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/pageflow/Page.java 2010-12-07 09:30:29 UTC (rev 13936)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/pageflow/Page.java 2010-12-07 16:14:11 UTC (rev 13937)
@@ -2,8 +2,13 @@
import org.dom4j.Element;
import org.jboss.seam.bpm.BusinessProcess;
+import org.jboss.seam.bpm.ManagedJbpmContext;
+import org.jboss.seam.contexts.BusinessProcessContext;
+import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Conversation;
import org.jboss.seam.core.Interpolator;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.jpdl.xml.JpdlXmlReader;
@@ -26,7 +31,9 @@
// In case it would be necessary, that file, can be customized
// by updating the reference to it in the central jbpm configuration
// file 'jbpm.cfg.xml'
-
+
+ private static final LogProvider log = Logging.getLogProvider(Page.class);
+
private static final long serialVersionUID = 1L;
private String viewId;
@@ -100,7 +107,19 @@
if ( isTaskEnd )
{
- BusinessProcess.instance().endTask(transition);
+ try
+ {
+ BusinessProcess.instance().endTask(transition);
+ }
+ catch (Exception e) {
+ log.debug("Closing JBPM context because exception(s) was thrown!");
+ Contexts.getBusinessProcessContext().flush();
+ throw new RuntimeException(e);
+ }
+ finally
+ {
+ ManagedJbpmContext.instance().close();
+ }
}
if (isConversationEnd || isTaskEnd )
14 years