[seam-commits] Seam SVN: r15460 - in branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam: annotations/bpm and 2 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Mar 20 07:09:09 EDT 2013
Author: vdedik
Date: 2013-03-20 07:09:09 -0400 (Wed, 20 Mar 2013)
New Revision: 15460
Removed:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/BeginTask.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/CreateProcess.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/EndTask.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/ResumeProcess.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/StartTask.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/Transition.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/package-info.java
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationInterceptor.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationalInterceptor.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Page.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Pages.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Rule.java
Log:
bz 923641 - removed bpm annotation
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -74,9 +74,6 @@
import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Synchronized;
import org.jboss.seam.annotations.Unwrap;
-import org.jboss.seam.annotations.bpm.BeginTask;
-import org.jboss.seam.annotations.bpm.EndTask;
-import org.jboss.seam.annotations.bpm.StartTask;
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.faces.Converter;
import org.jboss.seam.annotations.faces.Validator;
@@ -793,10 +790,7 @@
}
if ( method.isAnnotationPresent(Begin.class) ||
- method.isAnnotationPresent(End.class) ||
- method.isAnnotationPresent(StartTask.class) ||
- method.isAnnotationPresent(BeginTask.class) ||
- method.isAnnotationPresent(EndTask.class) )
+ method.isAnnotationPresent(End.class) )
{
conversationManagementMethods.add(method);
}
Deleted: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/BeginTask.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/BeginTask.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/BeginTask.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.seam.annotations.bpm;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import org.jboss.seam.annotations.FlushModeType;
-
-/**
- * Marks a method as causing a jBPM {@link org.jbpm.taskmgmt.exe.TaskInstance task}
- * to be resumed. The jBPM {@link org.jbpm.context.exe.ContextInstance}
- * is associated with the BUSINESS_PROCESS scope and the
- * {@link org.jbpm.taskmgmt.exe.TaskInstance} is associated with a new
- * conversation, unless the annotated method returns a null outcome.
- * <p/>
- * Note that both {@link BeginTask} and {@link StartTask} have effect
- * before invocation of the intercepted method in that they are both
- * about setting up appropriate {@link org.jbpm.context.exe.ContextInstance}
- * for the current {@link org.jboss.seam.contexts.BusinessProcessContext}.
- * <p/>
- *
- * @author Steve Ebersole
- */
- at Target(METHOD)
- at Retention(RUNTIME)
- at Documented
-public @interface BeginTask
-{
- /**
- * The name of the request parameter under which we should locate the
- * the id of task to be resumed.
- */
- String taskIdParameter() default "";
- /**
- * An EL expression that evaluates to the task id.
- * @return an EL expression
- */
- String taskId() default "#{param.taskId}";
- /**
- * The name of the jBPM process definition defining the page flow for
- * this conversation.
- */
- String pageflow() default "";
- /**
- * An EL expression for the conversation id. If a conversation with
- * the same id aready exists, Seam will redirect to that conversation.
- *
- * @deprecated use <conversation/> in pages.xml
- */
- String id() default "";
- /**
- * Set the FlushMode for any EntityManager used in
- * this conversation.
- */
- FlushModeType flushMode() default FlushModeType.AUTO;
-}
Deleted: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/CreateProcess.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/CreateProcess.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/CreateProcess.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.seam.annotations.bpm;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Marks a method creating a jBPM
- * {@link org.jbpm.graph.exe.ProcessInstance process instance}
- * unless the method throws an exception or returns a null outcome.
- *
- * @author Steve Ebersole
- */
- at Target(METHOD)
- at Retention(RUNTIME)
- at Documented
-public @interface CreateProcess
-{
- /**
- * The name of the {@link org.jbpm.graph.def.ProcessDefinition} from which
- * to create the {@link org.jbpm.graph.exe.ProcessInstance}
- */
- String definition();
- /**
- * An EL expression that evaluates to the process
- * business key.
- *
- * @return an EL expression or an empty string to indicate a null key
- */
- String processKey() default "";
-}
Deleted: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/EndTask.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/EndTask.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/EndTask.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.seam.annotations.bpm;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Marks a method as causing a jBPM
- * {@link org.jbpm.taskmgmt.exe.TaskInstance task instance}
- * to be ended. The current conversation also ends. If a list of outcomes
- * is specified, the task ends only if the outcome is in the list. A null
- * outcome never ends the task.
- *
- * @see org.jbpm.taskmgmt.exe.TaskInstance#end(String)
- * @author Gavin King
- */
- at Target(METHOD)
- at Retention(RUNTIME)
- at Documented
-public @interface EndTask
-{
-
- /**
- * An empty outcome list is interpreted to mean any
- * outcome except for the null (redisplay) outcome.
- *
- * @deprecated use BusinessProcess.instance().end("...") and
- * Conversation.instance().end()
- */
- String[] ifOutcome() default {};
-
- /**
- * Specifies the transition that should be triggered by
- * completing the task. If the transition needs to be
- * specified dynamically, use the Seam <tt>transition</tt>
- * component, calling <tt>Transition.setName()<tt>.
- *
- * @return a transition name
- */
- String transition() default "";
-
- /**
- * Should the conversation be destroyed before any
- * redirect? (The default behavior is to propagate
- * the conversation across the redirect and then
- * destroy it at the end of the redirected request.)
- *
- * @return false by default
- */
- boolean beforeRedirect() default false;
-
-}
Deleted: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/ResumeProcess.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/ResumeProcess.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/ResumeProcess.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.seam.annotations.bpm;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Marks a method as causing an existing jBPM
- * {@link org.jbpm.graph.exe.ProcessInstance process instance}
- * to be associated with the current conversation, unless the
- * annotated method returns a null outcome.
- *
- * @author Steve Ebersole
- */
- at Target(METHOD)
- at Retention(RUNTIME)
- at Documented
-public @interface ResumeProcess
-{
- /**
- * The name of the request parameter under which we should locate the
- * the id of process to be resumed.
- * (not required for lookup by business key)
- *
- * @return a request parameter name
- */
- String processIdParameter() default "";
- /**
- * An EL expression that evaluates to the process id.
- * (not required for lookup by business key)
- *
- * @return an EL expression
- */
- String processId() default "#{param.processId}";
- /**
- * An EL expression that evaluates to the process
- * business key.
- * (optional, only required for lookup by business key)
- *
- * @return an EL expression
- */
- String processKey() default "";
- /**
- * The name of the {@link org.jbpm.graph.def.ProcessDefinition}
- * (optional, only required for lookup by business key)
- */
- String definition() default "";
-}
Deleted: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/StartTask.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/StartTask.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/StartTask.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.seam.annotations.bpm;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import org.jboss.seam.annotations.FlushModeType;
-
-/**
- * Marks a method as causing jBPM {@link org.jbpm.taskmgmt.exe.TaskInstance task}
- * to be started. The jBPM {@link org.jbpm.context.exe.ContextInstance}
- * is associated with the BUSINESS_PROCESS scope and the
- * {@link org.jbpm.taskmgmt.exe.TaskInstance} is associated with a new
- * conversation, unless the annotated method returns a null outcome.
- * <p/>
- * Note that both {@link BeginTask} and {@link StartTask} have effect
- * before invocation of the intercepted method in that they are both
- * about setting up appropriate {@link org.jbpm.context.exe.ContextInstance}
- * for the current {@link org.jboss.seam.contexts.BusinessProcessContext};
- * {@link StartTask} however, also has effect after method invocation
- * as that is the time it actually marks the task as started.
- *
- * @see org.jbpm.taskmgmt.exe.TaskInstance#start()
- * @author Steve Ebersole
- */
- at Target( METHOD )
- at Retention( RUNTIME )
- at Documented
-public @interface StartTask
-{
- /**
- * The name of the request parameter under which we should locate the
- * the id of task to be started.
- */
- String taskIdParameter() default "";
- /**
- * An EL expression that evaluates to the task id.
- * @return an EL expression
- */
- String taskId() default "#{param.taskId}";
- /**
- * The name of the jBPM process definition defining
- * the page flow for this conversation.
- */
- String pageflow() default "";
- /**
- * An EL expression for the conversation id. If a conversation with
- * the same id aready exists, Seam will redirect to that conversation.
- *
- * @deprecated use <conversation/> in pages.xml
- */
- String id() default "";
- /**
- * Set the FlushMode for any EntityManager used in
- * this conversation.
- */
- FlushModeType flushMode() default FlushModeType.AUTO;
-}
Deleted: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/Transition.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/Transition.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/Transition.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.seam.annotations.bpm;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Marks a method as causing a jBPM transition after
- * the method returns a non-null result without exception.
- *
- * @author Gavin King
- */
- at Target(METHOD)
- at Retention(RUNTIME)
- at Documented
-public @interface Transition
-{
-
- /**
- * The transition name, defaults to the name
- * of the method.
- *
- * @return the transition name
- */
- String value() default "";
-
-}
Deleted: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/package-info.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/package-info.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/bpm/package-info.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -1,9 +0,0 @@
-/**
- * Annotations for controlling the business process
- * and business process context.
- *
- * @see org.jboss.seam.bpm
- * @see org.jboss.seam.bpm.BusinessProcess
- */
-package org.jboss.seam.annotations.bpm;
-
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationInterceptor.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationInterceptor.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationInterceptor.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -8,9 +8,6 @@
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.End;
import org.jboss.seam.annotations.FlushModeType;
-import org.jboss.seam.annotations.bpm.BeginTask;
-import org.jboss.seam.annotations.bpm.EndTask;
-import org.jboss.seam.annotations.bpm.StartTask;
import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
//import org.jboss.seam.bpm.BusinessProcessInterceptor;
@@ -95,14 +92,6 @@
{
id = method.getAnnotation(Begin.class).id();
}
- else if ( method.isAnnotationPresent(BeginTask.class) )
- {
- id = method.getAnnotation(BeginTask.class).id();
- }
- else if ( method.isAnnotationPresent(StartTask.class) )
- {
- id = method.getAnnotation(StartTask.class).id();
- }
if ( id!=null && !"".equals(id) )
{
@@ -140,9 +129,7 @@
method.isAnnotationPresent(Begin.class) &&
!method.getAnnotation(Begin.class).join() &&
!method.getAnnotation(Begin.class).nested()
- ) ||
- method.isAnnotationPresent(BeginTask.class) ||
- method.isAnnotationPresent(StartTask.class)
+ )
);
}
@@ -150,10 +137,7 @@
private void beginConversationIfNecessary(Method method, Object result)
{
- boolean simpleBegin =
- method.isAnnotationPresent(StartTask.class) ||
- method.isAnnotationPresent(BeginTask.class) ||
- ( method.isAnnotationPresent(Begin.class) && method.getAnnotation(Begin.class).ifOutcome().length==0 );
+ boolean simpleBegin = ( method.isAnnotationPresent(Begin.class) && method.getAnnotation(Begin.class).ifOutcome().length==0 );
if ( simpleBegin )
{
if ( result!=null || method.getReturnType().equals(void.class) )
@@ -189,14 +173,6 @@
{
flushMode = method.getAnnotation(Begin.class).flushMode();
}
- else if (method.isAnnotationPresent(BeginTask.class))
- {
- flushMode = method.getAnnotation(BeginTask.class).flushMode();
- }
- else if (method.isAnnotationPresent(StartTask.class))
- {
- flushMode = method.getAnnotation(StartTask.class).flushMode();
- }
else
{
return;
@@ -210,14 +186,6 @@
{
return method.getAnnotation(Begin.class).pageflow();
}
- if ( method.isAnnotationPresent(BeginTask.class) )
- {
- return method.getAnnotation(BeginTask.class).pageflow();
- }
- if ( method.isAnnotationPresent(StartTask.class) )
- {
- return method.getAnnotation(StartTask.class).pageflow();
- }
//TODO: let them pass a pageflow name as a request parameter
return "";
}
@@ -251,16 +219,13 @@
private void endConversationIfNecessary(Method method, Object result)
{
boolean isEndAnnotation = method.isAnnotationPresent(End.class);
- boolean isEndTaskAnnotation = method.isAnnotationPresent(EndTask.class);
- boolean beforeRedirect = ( isEndAnnotation && method.getAnnotation(End.class).beforeRedirect() ) ||
- ( isEndTaskAnnotation && method.getAnnotation(EndTask.class).beforeRedirect() );
+ boolean beforeRedirect = ( isEndAnnotation && method.getAnnotation(End.class).beforeRedirect() );
boolean endRoot = ( isEndAnnotation && method.getAnnotation(End.class).root() );
boolean simpleEnd =
- ( isEndAnnotation && method.getAnnotation(End.class).ifOutcome().length==0 ) ||
- ( isEndTaskAnnotation && method.getAnnotation(EndTask.class).ifOutcome().length==0 );
+ ( isEndAnnotation && method.getAnnotation(End.class).ifOutcome().length==0 );
if ( simpleEnd )
{
if ( result!=null || method.getReturnType().equals(void.class) ) //null outcome interpreted as redisplay
@@ -276,15 +241,6 @@
endConversation(beforeRedirect, endRoot);
}
}
- else if ( isEndTaskAnnotation )
- {
- //TODO: fix minor code duplication
- String[] outcomes = method.getAnnotation(EndTask.class).ifOutcome();
- if ( Arrays.asList(outcomes).contains(result) )
- {
- endConversation(beforeRedirect, endRoot);
- }
- }
}
private void endConversation(boolean beforeRedirect, boolean endRoot)
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationalInterceptor.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationalInterceptor.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationalInterceptor.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -8,8 +8,6 @@
import org.jboss.seam.annotations.Conversational;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
-import org.jboss.seam.annotations.bpm.BeginTask;
-import org.jboss.seam.annotations.bpm.StartTask;
import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
//import org.jboss.seam.bpm.BusinessProcessInterceptor;
@@ -49,8 +47,6 @@
boolean classlevelViolation = componentIsConversational() &&
!Manager.instance().isLongRunningOrNestedConversation() &&
!method.isAnnotationPresent(Begin.class) &&
- !method.isAnnotationPresent(StartTask.class) &&
- !method.isAnnotationPresent(BeginTask.class) &&
!method.isAnnotationPresent(Destroy.class) &&
!method.isAnnotationPresent(Create.class); //probably superfluous
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Page.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Page.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Page.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -287,7 +287,6 @@
boolean result = false;
getConversationControl().beginOrEndConversation();
- // getTaskControl().beginOrEndTask();
getProcessControl().createOrResumeProcess();
for ( Input in: getInputs() ) in.in();
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Pages.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Pages.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Pages.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -1337,60 +1337,6 @@
}
/**
- * Parse begin-task, start-task and end-task
- */
- /* private static void parseTaskControl(Element element, TaskControl control)
- {
- Element endTask = element.element("end-task");
- if ( endTask!=null )
- {
- control.setEndTask(true);
- String transition = endTask.attributeValue("transition");
- if (transition != null)
- {
- control.setTransition( Expressions.instance().createValueExpression(transition, String.class) );
- }
- }
-
- Element beginTask = element.element("begin-task");
- if ( beginTask!=null )
- {
- control.setBeginTask(true);
- String taskId = beginTask.attributeValue("task-id");
- if (taskId==null)
- {
- taskId = "#{param.taskId}";
- }
- control.setTaskId( Expressions.instance().createValueExpression(taskId, Long.class) );
- }
-
- Element startTask = element.element("start-task");
- if ( startTask!=null )
- {
- control.setStartTask(true);
- String taskId = startTask.attributeValue("task-id");
- if (taskId==null)
- {
- taskId = "#{param.taskId}";
- }
- control.setTaskId( Expressions.instance().createValueExpression(taskId, Long.class) );
- }
-
- if ( control.isBeginTask() && control.isEndTask() )
- {
- throw new IllegalStateException("cannot use both <begin-task/> and <end-task/>");
- }
- else if ( control.isBeginTask() && control.isStartTask() )
- {
- throw new IllegalStateException("cannot use both <start-task/> and <begin-task/>");
- }
- else if ( control.isStartTask() && control.isEndTask() )
- {
- throw new IllegalStateException("cannot use both <start-task/> and <end-task/>");
- }
- }*/
-
- /**
* Parse create-process and end-process
*/
private static void parseProcessControl(Element element, ProcessControl control)
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Rule.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Rule.java 2013-03-19 09:12:29 UTC (rev 15459)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Rule.java 2013-03-20 11:09:09 UTC (rev 15460)
@@ -86,7 +86,6 @@
public boolean execute(FacesContext context)
{
getConversationControl().beginOrEndConversation();
- //getTaskControl().beginOrEndTask();
getProcessControl().createOrResumeProcess();
for ( Output output: getOutputs() )
{
@@ -115,4 +114,4 @@
eventTypes.add(eventType);
}
}
-}
\ No newline at end of file
+}
More information about the seam-commits
mailing list