Seam SVN: r15469 - in branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam: core and 3 other directories.
by seam-commits＠lists.jboss.org
Author: ivassile
Date: 2013-03-28 14:15:51 -0400 (Thu, 28 Mar 2013)
New Revision: 15469
Added:
branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/blacklist.properties
Modified:
branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/core/Expressions.java
branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/exception/ErrorHandler.java
branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/exception/RedirectHandler.java
branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/faces/Navigator.java
branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/navigation/Pages.java
Log:
Porting JBPAPP-6233 (svn 14071 and 14234) to JBPAPP-1417
Added: branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/blacklist.properties
===================================================================
--- branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/blacklist.properties (rev 0)
+++ branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/blacklist.properties 2013-03-28 18:15:51 UTC (rev 15469)
@@ -0,0 +1,5 @@
+.getClass(
+.class.
+.addRole(
+.getPassword(
+.removeRole(
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/core/Expressions.java
===================================================================
--- branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/core/Expressions.java 2013-03-28 17:24:35 UTC (rev 15468)
+++ branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/core/Expressions.java 2013-03-28 18:15:51 UTC (rev 15469)
@@ -3,7 +3,14 @@
import static org.jboss.seam.annotations.Install.BUILT_IN;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
import javax.el.ELContext;
import javax.el.ExpressionFactory;
@@ -17,6 +24,8 @@
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.el.EL;
import org.jboss.seam.el.SeamExpressionFactory;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
/**
* Factory for EL method and value expressions.
@@ -31,7 +40,42 @@
@Name("org.jboss.seam.core.expressions")
public class Expressions implements Serializable
{
+
+ private static final LogProvider log = Logging.getLogProvider(Expressions.class);
+ private static List<String> blacklist = new ArrayList<String>();
+ // loading blacklisted patterns of non-valid EL expressions
+ static
+ {
+ BufferedReader reader = null;
+ try
+ {
+ InputStream blacklistIS = ResourceLoader.instance().getResourceAsStream("blacklist.properties");
+ reader = new BufferedReader(new InputStreamReader(blacklistIS));
+ String line;
+ while ((line = reader.readLine()) != null)
+ {
+ blacklist.add(line);
+ }
+ }
+ catch (IOException e)
+ {
+ log.warn("Black list of non-valid EL expressions was not found!");
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ try
+ {
+ reader.close();
+ }
+ catch (IOException e) { }
+ }
+ }
+
+ }
+
/**
* Get the JBoss EL ExpressionFactory
*/
@@ -76,7 +120,7 @@
*/
public <T> ValueExpression<T> createValueExpression(final String expression, final Class<T> type)
{
-
+ checkELExpression(expression);
return new ValueExpression<T>()
{
private javax.el.ValueExpression facesValueExpression;
@@ -140,6 +184,7 @@
*/
public <T> MethodExpression<T> createMethodExpression(final String expression, final Class<T> type, final Class... argTypes)
{
+ checkELExpression(expression);
return new MethodExpression<T>()
{
private javax.el.MethodExpression facesMethodExpression;
@@ -257,4 +302,34 @@
return (Expressions) Component.getInstance(Expressions.class, ScopeType.APPLICATION);
}
}
+
+
+ // optimalization of REGEX
+ final static String WHITESPACE_REGEX_STRING = "\\s";
+ final static Pattern WHITESPACE_REGEX_PATTERN = Pattern.compile(WHITESPACE_REGEX_STRING);
+
+ private static void checkELExpression(final String expression)
+ {
+ if (expression == null)
+ {
+ return;
+ }
+
+ final String expressionTrimmed = WHITESPACE_REGEX_PATTERN.matcher(expression).replaceAll("");
+
+ for (int index = 0; blacklist.size() > index; index++)
+ {
+ if ( expressionTrimmed.contains(blacklist.get(index)) ) {
+ throw new IllegalArgumentException("This EL expression is not allowed!");
+ }
+ }
+
+ // for any case blacklist is not provided this is definitely not permitted
+ if ( expressionTrimmed.contains(".getClass(") || expressionTrimmed.contains(".class.") )
+ {
+ throw new IllegalArgumentException("This EL expression is not allowed!");
+ }
+ }
+
}
+
Modified: branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/exception/ErrorHandler.java
===================================================================
--- branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/exception/ErrorHandler.java 2013-03-28 17:24:35 UTC (rev 15468)
+++ branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/exception/ErrorHandler.java 2013-03-28 18:15:51 UTC (rev 15469)
@@ -2,7 +2,6 @@
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Conversation;
-import org.jboss.seam.core.Interpolator;
/**
* Base implementation of HTTP error exception handlers.
@@ -26,7 +25,6 @@
}
String msg = getDisplayMessage( e, getMessage(e) );
- msg = msg==null ? null : Interpolator.instance().interpolate(msg);
error( getCode(e), msg );
}
Modified: branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/exception/RedirectHandler.java
===================================================================
--- branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/exception/RedirectHandler.java 2013-03-28 17:24:35 UTC (rev 15468)
+++ branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/exception/RedirectHandler.java 2013-03-28 18:15:51 UTC (rev 15469)
@@ -39,7 +39,7 @@
viewId = servletPath.substring(0, servletPath.lastIndexOf('.')) + Pages.getSuffix();
}
- addFacesMessage( getDisplayMessage(e, getMessage(e)), getMessageSeverity(e), null, e );
+ addFacesMessage( "#0", getMessageSeverity(e), null, getDisplayMessage(e, getMessage(e)));
if ( Contexts.isConversationContextActive() && isEnd(e) )
{
Modified: branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/faces/Navigator.java
===================================================================
--- branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/faces/Navigator.java 2013-03-28 17:24:35 UTC (rev 15468)
+++ branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/faces/Navigator.java 2013-03-28 18:15:51 UTC (rev 15469)
@@ -7,6 +7,7 @@
import javax.faces.context.FacesContext;
import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.core.Interpolator;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.navigation.Pages;
@@ -83,7 +84,7 @@
}
else
{
- return message;
+ return Interpolator.instance().interpolate(message, e);
}
}
Modified: branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/navigation/Pages.java
===================================================================
--- branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/navigation/Pages.java 2013-03-28 17:24:35 UTC (rev 15468)
+++ branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/src/main/org/jboss/seam/navigation/Pages.java 2013-03-28 18:15:51 UTC (rev 15469)
@@ -696,6 +696,10 @@
.getRequestParameterMap().get("actionMethod");
if (actionId!=null)
{
+ String decodedActionId = URLDecoder.decode(actionId);
+ if (decodedActionId != null && (decodedActionId.indexOf('#') >= 0 || decodedActionId.indexOf('{') >= 0) ){
+ throw new IllegalArgumentException("EL expressions are not allowed in actionMethod parameter");
+ }
if ( !SafeActions.instance().isActionSafe(actionId) ) return result;
String expression = SafeActions.toAction(actionId);
result = true;
11 years, 8 months
- 1
- 0
Seam SVN: r15468 - branches/enterprise.
by seam-commits＠lists.jboss.org
Author: ivassile
Date: 2013-03-28 13:24:35 -0400 (Thu, 28 Mar 2013)
New Revision: 15468
Added:
branches/enterprise/JBPAPP_5_0_1_JBPAPP-10694/
Log:
Create branch for JBPAPP-10694 from http://svn.jboss.org/repos/seam/branches/enterprise/JBPAPP_5_0_1_JBPAPP-4717
11 years, 8 months
- 1
- 0
Seam SVN: r15467 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2013-03-25 04:48:15 -0400 (Mon, 25 Mar 2013)
New Revision: 15467
Modified:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java
Log:
ignore BoundComponentConversationTest, assumes conversation can be started during a componet render
Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java 2013-03-25 08:37:08 UTC (rev 15466)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java 2013-03-25 08:48:15 UTC (rev 15467)
@@ -23,6 +23,7 @@
import org.jboss.seam.test.integration.Deployments;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -64,6 +65,7 @@
}
@Test
+ @Ignore
public void testConversationRestoration() throws Exception
{
Pattern conversationIdPattern = Pattern.compile("Conversation id: (\\d+)\\.");
11 years, 8 months
- 1
- 0
Seam SVN: r15466 - in branches/enterprise/WFK-2_1/jboss-seam/src: main/java/org/jboss/seam/core and 5 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2013-03-25 04:37:08 -0400 (Mon, 25 Mar 2013)
New Revision: 15466
Removed:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/faces/FacesPage.java
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationPropagation.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/faces/FacesManager.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.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/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java
Log:
bz921660 removing FacesPage, moving conversation restoration to pre restore view
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java 2013-03-25 08:28:30 UTC (rev 15465)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java 2013-03-25 08:37:08 UTC (rev 15466)
@@ -115,12 +115,6 @@
{
log.debug("Page Context will be lazilly created");
FacesLifecycle.resumePage();
- Map<String, String> parameters = facesContext.getExternalContext().getRequestParameterMap();
- ConversationPropagation.instance().restoreConversationId(parameters);
- boolean conversationFound = Manager.instance().restoreConversation();
- pageContext.get().set("org.jboss.seam.jsf.SeamPhaseListener.conversationFound", conversationFound);
-
- FacesLifecycle.resumeConversation(facesContext.getExternalContext());
}
}
}
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationPropagation.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationPropagation.java 2013-03-25 08:28:30 UTC (rev 15465)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/ConversationPropagation.java 2013-03-25 08:37:08 UTC (rev 15466)
@@ -54,7 +54,6 @@
{
restoreNaturalConversationId(parameters);
restoreSyntheticConversationId(parameters);
- restorePageContextConversationId();
getPropagationFromRequestParameter(parameters);
handlePropagationType(parameters);
}
@@ -73,26 +72,6 @@
}
}
- private void restorePageContextConversationId()
- {
- if ( Contexts.isPageContextActive() && isMissing(conversationId) )
- {
- //checkPageContext is a workaround for a bug in MySQL server-side state saving
-
- //if it is not passed as a request parameter,
- //try to get it from the page context
- org.jboss.seam.faces.FacesPage page = org.jboss.seam.faces.FacesPage.instance();
- conversationId = page.getConversationId();
- parentConversationId = null;
- validateLongRunningConversation = page.isConversationLongRunning();
- }
-
- else
- {
- log.trace("Found conversation id in request parameter: " + conversationId);
- }
- }
-
private void restoreNaturalConversationId(Map parameters)
{
conversationName = getRequestParameterValue(parameters, CONVERSATION_NAME_PARAMETER);
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/faces/FacesManager.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/faces/FacesManager.java 2013-03-25 08:28:30 UTC (rev 15465)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/faces/FacesManager.java 2013-03-25 08:37:08 UTC (rev 15466)
@@ -99,16 +99,6 @@
}
redirect(url, parameters, true, true);
}
-
- @Override
- protected void storeConversationToViewRootIfNecessary()
- {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- if ( facesContext!=null && (FacesLifecycle.getPhaseId()==PhaseId.RENDER_RESPONSE || FacesLifecycle.getPhaseId()==PhaseId.RESTORE_VIEW) )
- {
- FacesPage.instance().storeConversation();
- }
- }
@Override
protected String generateInitialConversationId()
Deleted: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/faces/FacesPage.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/faces/FacesPage.java 2013-03-25 08:28:30 UTC (rev 15465)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/faces/FacesPage.java 2013-03-25 08:37:08 UTC (rev 15466)
@@ -1,173 +0,0 @@
-package org.jboss.seam.faces;
-
-import static org.jboss.seam.annotations.Install.BUILT_IN;
-
-import java.io.Serializable;
-
-import org.jboss.seam.Component;
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.intercept.BypassInterceptors;
-import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.core.Init;
-import org.jboss.seam.core.Manager;
-//import org.jboss.seam.pageflow.Pageflow;
-import org.jboss.seam.web.Session;
-
-/**
- * Book-keeping component that persists information
- * about the conversation associated with the current
- * page.
- *
- * @author Gavin King
- *
- */
-@Name("org.jboss.seam.faces.facesPage")
-@BypassInterceptors
-@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
-(a)Scope(ScopeType.PAGE)
-public class FacesPage implements Serializable
-{
- private static final long serialVersionUID = 4807114041808347239L;
- private String pageflowName;
- private Integer pageflowCounter;
- private String pageflowNodeName;
-
- private String conversationId;
- private boolean conversationIsLongRunning;
-
- //private Map<String, Object> pageParameters;
-
- public String getConversationId()
- {
- return conversationId;
- }
-
- public void discardTemporaryConversation()
- {
- conversationId = null;
- conversationIsLongRunning = false;
- }
-
- public void discardNestedConversation(String outerConversationId)
- {
- conversationId = outerConversationId;
- conversationIsLongRunning = true;
- }
-
- public void storeConversation(String conversationId)
- {
- this.conversationId = conversationId;
- conversationIsLongRunning = true;
- }
-
- public void storePageflow()
- {
-// if ( Init.instance().isJbpmInstalled() )
-// {
-// Pageflow pageflow = Pageflow.instance();
-// if ( pageflow.isInProcess() /*&& !pageflow.getProcessInstance().hasEnded()*/ && Manager.instance().isLongRunningConversation() )
-// {
-// pageflowName = pageflow.getSubProcessInstance().getProcessDefinition().getName();
-// pageflowNodeName = pageflow.getNode().getName();
-// pageflowCounter = pageflow.getPageflowCounter();
-// }
-// else
-// {
-// pageflowName = null;
-// pageflowNodeName = null;
-// pageflowCounter = null;
-// }
-// }
- }
-
- public static FacesPage instance()
- {
- if ( !Contexts.isPageContextActive() )
- {
- throw new IllegalStateException("No page context active");
- }
- return (FacesPage) Component.getInstance(FacesPage.class, ScopeType.PAGE);
- }
-
- public boolean isConversationLongRunning()
- {
- return conversationIsLongRunning;
- }
-
- public Integer getPageflowCounter()
- {
- return pageflowCounter;
- }
-
- public String getPageflowName()
- {
- return pageflowName;
- }
-
- public String getPageflowNodeName()
- {
- return pageflowNodeName;
- }
-
- public void storeConversation()
- {
- Manager manager = Manager.instance();
-
- //we only need to execute this code when we are in the
- //RENDER_RESPONSE phase, ie. not before redirects
-
- Session session = Session.getInstance();
- boolean sessionInvalid = session!=null && session.isInvalid();
- if ( !sessionInvalid && manager.isLongRunningConversation() )
- {
- storeConversation( manager.getCurrentConversationId() );
- }
- else if ( !sessionInvalid && manager.isNestedConversation() )
- {
- discardNestedConversation( manager.getParentConversationId() );
- }
- else
- {
- discardTemporaryConversation();
- }
-
- /*if ( !sessionInvalid && Init.instance().isClientSideConversations() )
- {
- // if we are using client-side conversations, put the
- // map containing the conversation context variables
- // into the view root (or remove it for a temp
- // conversation context)
- Contexts.getConversationContext().flush();
- }*/
-
- }
-
- /*public Map<String, Object> getPageParameters()
- {
- return pageParameters==null ? Collections.EMPTY_MAP : pageParameters;
- }
-
- public void setPageParameters(Map<String, Object> pageParameters)
- {
- this.pageParameters = pageParameters.isEmpty() ? null : pageParameters;
- }
-
- /**
- * Used by test harness
- *
- * @param name the page parameter name
- * @param value the value
- */
- /*public void setPageParameter(String name, Object value)
- {
- if (pageParameters==null)
- {
- pageParameters = new HashMap<String, Object>();
- }
- pageParameters.put(name, value);
- }*/
-
-}
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java 2013-03-25 08:28:30 UTC (rev 15465)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java 2013-03-25 08:37:08 UTC (rev 15466)
@@ -34,7 +34,6 @@
import org.jboss.seam.exception.Exceptions;
import org.jboss.seam.faces.FacesManager;
import org.jboss.seam.faces.FacesMessages;
-import org.jboss.seam.faces.FacesPage;
import org.jboss.seam.faces.Switcher;
import org.jboss.seam.faces.Validation;
import org.jboss.seam.log.LogProvider;
@@ -116,6 +115,19 @@
{
beforeServletPhase(event);
}
+
+ // We resume conversation after handleTransactionsBeforePhase,
+ // so that Conversation-scoped entityManager has a transaction to enlist
+ if (event.getPhaseId() == RESTORE_VIEW) {
+ FacesContext facesContext = event.getFacesContext();
+ Map<String, String> parameters = facesContext.getExternalContext().getRequestParameterMap();
+ ConversationPropagation.instance().restoreConversationId(parameters);
+ boolean conversationFound = Manager.instance().restoreConversation();
+
+ Contexts.getEventContext().set("org.jboss.seam.jsf.SeamPhaseListener.conversationFound", conversationFound);
+ FacesLifecycle.resumeConversation(facesContext.getExternalContext());
+ }
+
raiseEventsBeforePhase(event);
}
catch (Exception e)
@@ -384,18 +396,15 @@
* Restore the page and conversation contexts during a JSF request
*/
protected void afterRestoreView(FacesContext facesContext)
- {
- boolean conversationFound = Contexts.isPageContextActive() ? Contexts.getPageContext().isSet("org.jboss.seam.jsf.SeamPhaseListener.conversationFound") : false;
- FacesLifecycle.resumePage();
- Map parameters = facesContext.getExternalContext().getRequestParameterMap();
- if (!conversationFound) // there is exceptional case when restoring of conversation wasn't called while page context was lazily initialized
- {
- ConversationPropagation.instance().restoreConversationId(parameters);
- conversationFound = Manager.instance().restoreConversation();
- }
- FacesLifecycle.resumeConversation( facesContext.getExternalContext() );
- postRestorePage(facesContext, parameters, conversationFound);
-
+ {
+ boolean conversationFound = Contexts.isEventContextActive() ? Contexts.getEventContext().isSet("org.jboss.seam.jsf.SeamPhaseListener.conversationFound") : false;
+
+ if (!Contexts.isPageContextActive()) {
+ FacesLifecycle.resumePage();
+ }
+
+ Map parameters = facesContext.getExternalContext().getRequestParameterMap();
+ postRestorePage(facesContext, parameters, conversationFound);
}
public void raiseEventsBeforePhase(PhaseEvent event)
@@ -491,9 +500,6 @@
FacesManager.instance().prepareBackswitch(facesContext);
}
- FacesPage.instance().storeConversation();
- FacesPage.instance().storePageflow();
-
PersistenceContexts persistenceContexts = PersistenceContexts.instance();
if (persistenceContexts != null)
{
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java 2013-03-25 08:28:30 UTC (rev 15465)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java 2013-03-25 08:37:08 UTC (rev 15466)
@@ -99,18 +99,22 @@
if (!getSource().equals(Source.BOOKMARKABLE) && !getSource().equals(Source.REDIRECT) )
{
- if ( !conversation.isNested() || conversation.isLongRunning() )
+ if (conversation.isLongRunning())
{
return new FacesUrlTransformer(actionUrl, facesContext)
.appendConversationIdIfNecessary(conversationIdParameter, conversation.getId())
.getUrl();
}
- else
+ else if (conversation.isNested())
{
return new FacesUrlTransformer(actionUrl, facesContext)
.appendConversationIdIfNecessary(conversationIdParameter, conversation.getParentId())
.getUrl();
}
+ else
+ {
+ return actionUrl;
+ }
} else {
return actionUrl;
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java 2013-03-25 08:28:30 UTC (rev 15465)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java 2013-03-25 08:37:08 UTC (rev 15466)
@@ -78,6 +78,7 @@
protected MockHttpSession session;
private Map<String, Map> conversationViewRootAttributes;
protected Filter seamFilter;
+ protected String conversationIdParameter = "conversationId";
private static ServletContext realServletContext = null;
@@ -122,7 +123,7 @@
protected String getConversationIdParameter()
{
- return "conversationId";
+ return conversationIdParameter;
}
/**
@@ -741,6 +742,12 @@
setParameter(getConversationIdParameter(), conversationId);
}
phases.beforePhase(new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE));
+
+ // We cannot get conversationIdParameter before restore view phase, as Manager is in
+ // event context, which is not active yet, so we hope we set this in the first request
+ // and we assume it won't change. In other cases, you may just override getConversationIdParameter();
+ conversationIdParameter = Manager.instance().getConversationIdParameter();
+
try
{
UIViewRoot viewRoot = facesContext.getApplication().getViewHandler().createView(facesContext, getViewId());
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-25 08:28:30 UTC (rev 15465)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/navigation/Pages.java 2013-03-25 08:37:08 UTC (rev 15466)
@@ -568,21 +568,9 @@
{
noConversation();
- //stuff from jPDL takes precedence
- org.jboss.seam.faces.FacesPage facesPage = org.jboss.seam.faces.FacesPage.instance();
- String pageflowName = facesPage.getPageflowName();
- String pageflowNodeName = facesPage.getPageflowNodeName();
-
String noConversationViewId = null;
- if (pageflowName==null || pageflowNodeName==null)
- {
- String viewId = Pages.getCurrentViewId();
- noConversationViewId = getNoConversationViewId(viewId);
- }
- else
- {
- //noConversationViewId = Pageflow.instance().getNoConversationViewId(pageflowName, pageflowNodeName);
- }
+ String viewId = Pages.getCurrentViewId();
+ noConversationViewId = getNoConversationViewId(viewId);
if (noConversationViewId!=null)
{
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java 2013-03-25 08:28:30 UTC (rev 15465)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java 2013-03-25 08:37:08 UTC (rev 15466)
@@ -26,16 +26,17 @@
import org.jboss.seam.core.ResourceLoader;
import org.jboss.seam.faces.FacesManager;
import org.jboss.seam.faces.FacesMessages;
-import org.jboss.seam.faces.FacesPage;
import org.jboss.seam.faces.Validation;
import org.jboss.seam.jsf.SeamPhaseListener;
import org.jboss.seam.jsf.SeamStateManager;
import org.jboss.seam.mock.MockApplication;
import org.jboss.seam.mock.MockExternalContext;
import org.jboss.seam.mock.MockFacesContext;
+import org.jboss.seam.mock.MockHttpServletRequest;
import org.jboss.seam.mock.MockLifecycle;
import org.jboss.seam.navigation.Pages;
import org.jboss.seam.servlet.ServletRequestSessionMap;
+import org.jboss.seam.web.ServletContexts;
import org.jboss.seam.web.Session;
import org.testng.annotations.Test;
@@ -49,7 +50,6 @@
appContext.set( Seam.getComponentName(Init.class), init );
installComponent(appContext, FacesManager.class);
installComponent(appContext, ConversationEntries.class);
- installComponent(appContext, FacesPage.class);
installComponent(appContext, Conversation.class);
installComponent(appContext, FacesMessages.class);
installComponent(appContext, Pages.class);
@@ -58,6 +58,7 @@
installComponent(appContext, Session.class);
installComponent(appContext, ConversationPropagation.class);
installComponent(appContext, ResourceLoader.class);
+ installComponent(appContext, ServletContexts.class);
}
private void installComponent(Context appContext, Class clazz)
@@ -93,7 +94,7 @@
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
- assert !Contexts.isConversationContextActive();
+ assert Contexts.isConversationContextActive();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) );
@@ -115,9 +116,7 @@
phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) );
- // there is one additional item - conversationFound
- assert facesContext.getViewRoot().getViewMap().size()==2;
- assert ( (FacesPage) getPageMap(facesContext).get( getPrefix() + Seam.getComponentName(FacesPage.class) ) ).getConversationId()==null;
+ assert facesContext.getViewRoot().getViewMap().size()==0;
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
@@ -144,7 +143,8 @@
{
MockFacesContext facesContext = createFacesContext();
- getPageMap(facesContext).put( getPrefix() + Seam.getComponentName(FacesPage.class), new FacesPage() { @Override public String getConversationId() { return "2"; } });
+ MockHttpServletRequest request = (MockHttpServletRequest)facesContext.getExternalContext().getRequest();
+ request.getParameters().put("conversationId", new String[] {"2"});
List<String> conversationIdStack = new ArrayList<String>();
conversationIdStack.add("2");
@@ -165,7 +165,7 @@
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
- assert !Contexts.isConversationContextActive();
+ assert Contexts.isConversationContextActive();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) );
@@ -196,10 +196,9 @@
facesContext.getApplication().getStateManager().saveView(facesContext);
+ assert Manager.instance().getCurrentConversationId().equals("2");
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) );
- assert ( (FacesPage) getPageMap(facesContext).get( getPrefix() + Seam.getComponentName(FacesPage.class) ) ).getConversationId().equals("2");
-
assert !Contexts.isEventContextActive();
assert !Contexts.isSessionContextActive();
assert !Contexts.isApplicationContextActive();
@@ -228,7 +227,7 @@
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
- assert !Contexts.isConversationContextActive();
+ assert Contexts.isConversationContextActive();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) );
@@ -259,7 +258,7 @@
facesContext.getApplication().getStateManager().saveView(facesContext);
- assert facesContext.getViewRoot().getViewMap().size()==2;
+ assert facesContext.getViewRoot().getViewMap().size()==0;
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) );
@@ -285,7 +284,7 @@
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
- assert !Contexts.isConversationContextActive();
+ assert Contexts.isConversationContextActive();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) );
@@ -327,7 +326,7 @@
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
- assert !Contexts.isConversationContextActive();
+ assert Contexts.isConversationContextActive();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) );
@@ -336,8 +335,8 @@
phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) );
- assert facesContext.getViewRoot().getViewMap().size()==2;
- assert ( (FacesPage) getPageMap(facesContext).get( getPrefix() + Seam.getComponentName(FacesPage.class) ) ).getConversationId()==null;
+ assert facesContext.getViewRoot().getViewMap().size()==0;
+ //assert ( (FacesPage) getPageMap(facesContext).get( getPrefix() + Seam.getComponentName(FacesPage.class) ) ).getConversationId()==null;
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
11 years, 8 months
- 1
- 0
Seam SVN: r15465 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-03-25 04:28:30 -0400 (Mon, 25 Mar 2013)
New Revision: 15465
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath
Log:
fixed updated ARQ libs in eclipse .classpath file
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2013-03-21 17:25:22 UTC (rev 15464)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2013-03-25 08:28:30 UTC (rev 15465)
@@ -122,131 +122,133 @@
<classpathentry kind="lib" path="lib/woodstox-core-asl.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
<classpathentry kind="lib" path="lib/test/aether-api-1.8.jar"/>
- <classpathentry kind="lib" path="lib/test/aether-connector-wagon-1.8.jar"/>
- <classpathentry kind="lib" path="lib/test/aether-impl-1.8.jar"/>
- <classpathentry kind="lib" path="lib/test/aether-spi-1.8.jar"/>
- <classpathentry kind="lib" path="lib/test/aether-util-1.8.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-config-api-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-config-impl-base-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-container-impl-base-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-container-osgi-1.0.2.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-container-spi-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-container-test-api-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-container-test-impl-base-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-container-test-spi-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-core-api-1.0.0.CR7.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-core-impl-base-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-core-spi-1.0.0.CR7.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-junit-container-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-junit-core-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-protocol-jmx-1.0.0.CR7.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-protocol-servlet-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-test-api-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-testenricher-cdi-1.0.0.CR7.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-testenricher-ejb-1.0.0.CR7.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-testenricher-initialcontext-1.0.0.CR7.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-testenricher-osgi-1.0.2.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-testenricher-resource-1.0.0.CR7.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-test-impl-base-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/arquillian-test-spi-1.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/google-collections-1.0.jar"/>
- <classpathentry kind="lib" path="lib/test/hibernate-validator-4.2.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/httpserver-1.0.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jandex-1.0.3.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/javax.inject-1.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-deployment-1.0.12.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-framework-core-1.1.8.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-metadata-2.0.3.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-repository-api-1.0.5.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-repository-core-1.0.5.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-resolver-api-1.0.13.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-resolver-api-v2-2.0.0.Beta2.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-resolver-felix-1.0.13.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-resolver-spi-1.0.13.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-spi-3.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-vfs-1.0.7.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jbosgi-vfs30-1.0.7.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-annotations-api_1.1_spec-1.0.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-common-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-container-remote-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-protocol-jmx-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-testenricher-msc-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-build-config-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-controller-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-controller-client-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-deployment-repository-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-domain-http-interface-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-domain-management-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-ee-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-embedded-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-jmx-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-naming-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-network-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-osgi-service-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-platform-mbean-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-process-controller-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-protocol-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-remoting-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-server-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-as-threads-7.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-common-core-2.2.17.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-dmr-1.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-ejb-client-1.0.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-interceptors-api_1.1_spec-1.0.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-interceptor-spi-2.0.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-invocation-1.1.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-logging-3.1.0.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-logmanager-1.2.2.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-logmanager-log4j-1.0.0.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-marshalling-1.3.11.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-marshalling-river-1.3.11.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-metadata-common-7.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-metadata-ear-7.0.1.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-modules-1.1.1.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-msc-1.0.2.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-remote-naming-1.0.2.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-remoting-3.2.13.GA-redhat-1.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-sasl-1.0.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-stdio-1.0.1.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-threads-2.0.0.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jboss-vfs-3.1.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/jdk-tools-jdk.jar"/>
- <classpathentry kind="lib" path="lib/test/log4j-1.2.12.jar"/>
- <classpathentry kind="lib" path="lib/test/maven-aether-provider-3.0.1.jar"/>
- <classpathentry kind="lib" path="lib/test/maven-model-3.0.1.jar"/>
- <classpathentry kind="lib" path="lib/test/maven-model-builder-3.0.1.jar"/>
- <classpathentry kind="lib" path="lib/test/maven-repository-metadata-3.0.1.jar"/>
- <classpathentry kind="lib" path="lib/test/maven-settings-3.0.1.jar"/>
- <classpathentry kind="lib" path="lib/test/maven-settings-builder-3.0.1.jar"/>
- <classpathentry kind="lib" path="lib/test/org.apache.felix.resolver-0.1.0.Beta1.jar"/>
- <classpathentry kind="lib" path="lib/test/org.osgi.compendium-4.2.0.jar"/>
- <classpathentry kind="lib" path="lib/test/org.osgi.core-4.2.0.jar"/>
- <classpathentry kind="lib" path="lib/test/org.osgi.enterprise-4.2.0.jar"/>
- <classpathentry kind="lib" path="lib/test/plexus-cipher-1.4.jar"/>
- <classpathentry kind="lib" path="lib/test/plexus-classworlds-2.2.2.jar"/>
- <classpathentry kind="lib" path="lib/test/plexus-component-annotations-1.5.5.jar"/>
- <classpathentry kind="lib" path="lib/test/plexus-container-default-1.5.5.jar"/>
- <classpathentry kind="lib" path="lib/test/plexus-interpolation-1.14.jar"/>
- <classpathentry kind="lib" path="lib/test/plexus-sec-dispatcher-1.3.jar"/>
- <classpathentry kind="lib" path="lib/test/plexus-utils-2.0.4.jar"/>
- <classpathentry kind="lib" path="lib/test/remoting-jmx-1.0.4.Final-redhat-1.jar"/>
- <classpathentry kind="lib" path="lib/test/shrinkwrap-api-1.0.0-cr-1.jar"/>
- <classpathentry kind="lib" path="lib/test/shrinkwrap-descriptors-api-base-2.0.0-alpha-3.jar"/>
- <classpathentry kind="lib" path="lib/test/shrinkwrap-descriptors-spi-2.0.0-alpha-3.jar"/>
- <classpathentry kind="lib" path="lib/test/shrinkwrap-impl-base-1.0.1.jar"/>
- <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-1.0.0-beta-5.jar"/>
- <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-maven-1.0.0-beta-5.jar"/>
- <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-impl-maven-1.0.0-beta-5.jar"/>
- <classpathentry kind="lib" path="lib/test/shrinkwrap-spi-1.0.1.jar"/>
- <classpathentry kind="lib" path="lib/test/slf4j-api-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/test/staxmapper-1.1.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/test/validation-api-1.0.0.GA.jar"/>
- <classpathentry kind="lib" path="lib/test/wagon-file-1.0-beta-7.jar"/>
- <classpathentry kind="lib" path="lib/test/wagon-http-lightweight-1.0-beta-7.jar"/>
- <classpathentry kind="lib" path="lib/test/wagon-http-shared-1.0-beta-7.jar"/>
- <classpathentry kind="lib" path="lib/test/wagon-provider-api-1.0-beta-7.jar"/>
- <classpathentry kind="lib" path="lib/test/xbean-reflect-3.4.jar"/>
- <classpathentry kind="lib" path="lib/test/xnio-api-3.0.7.GA-redhat-1.jar"/>
- <classpathentry kind="lib" path="lib/test/xnio-nio-3.0.7.GA-redhat-1.jar"/>
+ <classpathentry kind="lib" path="lib/test/aether-connector-wagon-1.8.jar"/>
+ <classpathentry kind="lib" path="lib/test/aether-impl-1.8.jar"/>
+ <classpathentry kind="lib" path="lib/test/aether-spi-1.8.jar"/>
+ <classpathentry kind="lib" path="lib/test/aether-util-1.8.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-config-api-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-config-impl-base-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-container-impl-base-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-container-osgi-1.0.2.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-container-spi-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-container-test-api-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-container-test-impl-base-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-container-test-spi-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-core-api-1.0.0.CR7.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-core-impl-base-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-core-spi-1.0.0.CR7.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-junit-container-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-junit-core-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-protocol-jmx-1.0.0.CR7.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-protocol-servlet-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-test-api-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-testenricher-cdi-1.0.0.CR7.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-testenricher-ejb-1.0.0.CR7.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-testenricher-initialcontext-1.0.0.CR7.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-testenricher-osgi-1.0.2.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-testenricher-resource-1.0.0.CR7.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-test-impl-base-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/arquillian-test-spi-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/google-collections-1.0.jar"/>
+ <classpathentry kind="lib" path="lib/test/hibernate-validator-4.2.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/httpserver-1.0.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jandex-1.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/javax.inject-1.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-deployment-1.0.12.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-framework-core-1.1.8.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-metadata-2.0.3.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-repository-api-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-repository-core-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-resolver-api-1.0.13.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-resolver-api-v2-2.0.0.Beta2.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-resolver-felix-1.0.13.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-resolver-spi-1.0.13.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-spi-3.0.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-vfs-1.0.7.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jbosgi-vfs30-1.0.7.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-annotations-api_1.1_spec-1.0.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-common-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-container-remote-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-protocol-jmx-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-testenricher-msc-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-build-config-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-controller-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-controller-client-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-deployment-repository-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-domain-http-interface-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-domain-management-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-ee-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-embedded-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-jmx-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-naming-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-network-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-osgi-service-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-platform-mbean-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-process-controller-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-protocol-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-remoting-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-server-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-as-threads-7.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-common-core-2.2.17.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-dmr-1.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-ejb-client-1.0.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-interceptors-api_1.1_spec-1.0.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-interceptor-spi-2.0.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-invocation-1.1.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-logging-3.1.0.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-logmanager-1.2.2.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-logmanager-log4j-1.0.0.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-marshalling-1.3.11.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-marshalling-river-1.3.11.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-metadata-common-7.0.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-metadata-ear-7.0.1.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-modules-1.1.1.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-msc-1.0.2.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-remote-naming-1.0.2.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-remoting-3.2.13.GA-redhat-1.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-sasl-1.0.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-stdio-1.0.1.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-threads-2.0.0.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jboss-vfs-3.1.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/jdk-tools-jdk.jar"/>
+ <classpathentry kind="lib" path="lib/test/log4j-1.2.12.jar"/>
+ <classpathentry kind="lib" path="lib/test/maven-aether-provider-3.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/maven-model-3.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/maven-model-builder-3.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/maven-repository-metadata-3.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/maven-settings-3.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/maven-settings-builder-3.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/org.apache.felix.resolver-0.1.0.Beta1.jar"/>
+ <classpathentry kind="lib" path="lib/test/org.osgi.compendium-4.2.0.jar"/>
+ <classpathentry kind="lib" path="lib/test/org.osgi.core-4.2.0.jar"/>
+ <classpathentry kind="lib" path="lib/test/org.osgi.enterprise-4.2.0.jar"/>
+ <classpathentry kind="lib" path="lib/test/plexus-cipher-1.4.jar"/>
+ <classpathentry kind="lib" path="lib/test/plexus-classworlds-2.2.2.jar"/>
+ <classpathentry kind="lib" path="lib/test/plexus-component-annotations-1.5.5.jar"/>
+ <classpathentry kind="lib" path="lib/test/plexus-container-default-1.5.5.jar"/>
+ <classpathentry kind="lib" path="lib/test/plexus-interpolation-1.14.jar"/>
+ <classpathentry kind="lib" path="lib/test/plexus-sec-dispatcher-1.3.jar"/>
+ <classpathentry kind="lib" path="lib/test/plexus-utils-2.0.4.jar"/>
+ <classpathentry kind="lib" path="lib/test/remoting-jmx-1.0.4.Final-redhat-1.jar"/>
+ <classpathentry kind="lib" path="lib/test/shrinkwrap-api-1.0.0-cr-1.jar"/>
+ <classpathentry kind="lib" path="lib/test/shrinkwrap-descriptors-api-base-2.0.0-alpha-3.jar"/>
+ <classpathentry kind="lib" path="lib/test/shrinkwrap-descriptors-spi-2.0.0-alpha-3.jar"/>
+ <classpathentry kind="lib" path="lib/test/shrinkwrap-impl-base-1.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-1.0.0-beta-5.jar"/>
+ <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-maven-1.0.0-beta-5.jar"/>
+ <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-impl-maven-1.0.0-beta-5.jar"/>
+ <classpathentry kind="lib" path="lib/test/shrinkwrap-spi-1.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/slf4j-api-1.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/staxmapper-1.1.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/test/validation-api-1.0.0.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/wagon-file-1.0-beta-7.jar"/>
+ <classpathentry kind="lib" path="lib/test/wagon-http-lightweight-1.0-beta-7.jar"/>
+ <classpathentry kind="lib" path="lib/test/wagon-http-shared-1.0-beta-7.jar"/>
+ <classpathentry kind="lib" path="lib/test/wagon-provider-api-1.0-beta-7.jar"/>
+ <classpathentry kind="lib" path="lib/test/xbean-reflect-3.4.jar"/>
+ <classpathentry kind="lib" path="lib/test/xnio-api-3.0.3.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/xnio-api-3.0.7.GA-redhat-1.jar"/>
+ <classpathentry kind="lib" path="lib/test/xnio-nio-3.0.3.GA.jar"/>
+ <classpathentry kind="lib" path="lib/test/xnio-nio-3.0.7.GA-redhat-1.jar"/>
</classpath>
11 years, 8 months
- 1
- 0
Seam SVN: r15464 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-03-21 13:25:22 -0400 (Thu, 21 Mar 2013)
New Revision: 15464
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml
Log:
bz924272 - fixed EAR project testsuite
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml 2013-03-20 16:01:49 UTC (rev 15463)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml 2013-03-21 17:25:22 UTC (rev 15464)
@@ -78,6 +78,12 @@
<filter token="seamEmfRef" value="${seamEmfRef}"/>
<filter token="puJndiName" value="${puJndiName}"/>
</filterset>
+ <filterset id="test">
+ <filter token="ejbJndiPattern" value="java:app/test/#{ejbName}"/>
+ <filter token="seamBootstrapsPu" value="${seamBootstrapsPu}"/>
+ <filter token="seamEmfRef" value="${seamEmfRef}"/>
+ <filter token="puJndiName" value="${puJndiName}"/>
+ </filterset>
<filterset id="profile">
<filter token="debug" value="${debug}"/>
</filterset>
@@ -439,6 +445,12 @@
<copy tofile="${test.dir}/import.sql"
file="${basedir}/resources/import-test.sql"/>
<copy tofile="${test.dir}/components.properties"
+ file="${basedir}/resources/components-test.properties">
+ <filterset refid="test"/>
+ </copy>
+ <copy tofile="${test.dir}/WEB-INF/ejb-jar.xml"
+ file="${basedir}/resources/META-INF/ejb-jar.xml"/>
+ <copy tofile="${test.dir}/components.properties"
file="${basedir}/resources/components-test.properties"/>
<copy tofile="${test.dir}/WEB-INF/web.xml"
file="${basedir}/resources/WEB-INF/web-test.xml"/>
11 years, 8 months
- 1
- 0
Seam SVN: r15463 - in branches/enterprise/WFK-2_1: jboss-seam-gen/dist/build-scripts and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-03-20 12:01:49 -0400 (Wed, 20 Mar 2013)
New Revision: 15463
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list
branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/seam-deployment.properties
branches/enterprise/WFK-2_1/seam-integration-tests/pom.xml
Log:
bz 923641 removed other occurences of jbpm
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/seam-deployment.properties
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/seam-deployment.properties 2013-03-20 12:36:24 UTC (rev 15462)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/seam-deployment.properties 2013-03-20 16:01:49 UTC (rev 15463)
@@ -1,2 +1 @@
-org.jboss.seam.deployment.deploymentHandlers=org.jboss.seam.bpm.PageflowDeploymentHandler
org.jboss.seam.init.duplicateJarsPatterns=^tmp\\d+(\\S*.jar)
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml 2013-03-20 12:36:24 UTC (rev 15462)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml 2013-03-20 16:01:49 UTC (rev 15463)
@@ -242,7 +242,6 @@
<include name="META-INF/*.drl" />
<include name="*jpdl.xml" />
<include name="*hibernate.cfg.xml" />
- <include name="jbpm.cfg.xml" />
<include name="META-INF/orm.xml" />
<include name="*.skin.properties" if="richfaces.present"/>
<include name="**/*.ecss" if="richfaces.present"/>
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml 2013-03-20 12:36:24 UTC (rev 15462)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml 2013-03-20 16:01:49 UTC (rev 15463)
@@ -243,7 +243,6 @@
<fileset dir="${basedir}/resources">
<include name="*jpdl.xml"/>
<include name="*hibernate.cfg.xml"/>
- <include name="jbpm.cfg.xml"/>
</fileset>
<fileset dir="${lib.dir}">
<include name="jboss-seam.jar"/>
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list 2013-03-20 12:36:24 UTC (rev 15462)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/deployed-jars-war.list 2013-03-20 16:01:49 UTC (rev 15463)
@@ -47,7 +47,6 @@
jboss-seam-pdf.jar
itext.jar
itext-rtf.jar
-jbpm-jpdl.jar
hibernate-ehcache.jar
ehcache-core.jar
jackrabbit-spi-commons.jar
Modified: branches/enterprise/WFK-2_1/seam-integration-tests/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/pom.xml 2013-03-20 12:36:24 UTC (rev 15462)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/pom.xml 2013-03-20 16:01:49 UTC (rev 15463)
@@ -323,7 +323,6 @@
<dir>src/test/resources/WEB-INF/</dir>
<includes>
<include>components.xml</include>
- <include>components-jbpm.xml</include>
<include>ejb-jar.xml</include>
<include>faces-config.xml</include>
</includes>
11 years, 8 months
- 1
- 0
Seam SVN: r15462 - in branches/enterprise/WFK-2_1/jboss-seam-gen/dist: resources/WEB-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-03-20 08:36:24 -0400 (Wed, 20 Mar 2013)
New Revision: 15462
Added:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web-test.xml
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml
Log:
bz922051 added mocked web.xml into seam-gen generated tests
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml 2013-03-20 12:36:14 UTC (rev 15461)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build-war.xml 2013-03-20 12:36:24 UTC (rev 15462)
@@ -406,6 +406,8 @@
<exclude name="import*.sql"/>
<exclude name="${project.name}-*-ds.xml"/>
<exclude name="components-*.properties"/>
+ <exclude name="WEB-INF/web-*.xml"/>
+ <exclude name="WEB-INF/web.xml"/>
</fileset>
<fileset dir="${basedir}/view"/>
</copy>
@@ -415,13 +417,13 @@
file="${basedir}/resources/import-test.sql"/>
<copy tofile="${test.dir}/components.properties"
file="${basedir}/resources/components-test.properties"/>
+ <copy tofile="${test.dir}/WEB-INF/web.xml"
+ file="${basedir}/resources/WEB-INF/web-test.xml"/>
<copy todir="${test.dir}" flatten="true">
<fileset dir="${src.test.dir}">
<include name="**/*Test.xml"/>
</fileset>
- </copy>
- <copy tofile="${test.dir}/components.properties"
- file="${basedir}/resources/components-test.properties"/>
+ </copy>
</target>
<target name="test" depends="buildtest" description="Run the tests">
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml 2013-03-20 12:36:14 UTC (rev 15461)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build-scripts/build.xml 2013-03-20 12:36:24 UTC (rev 15462)
@@ -430,6 +430,8 @@
<exclude name="import*.sql"/>
<exclude name="${project.name}-*-ds.xml"/>
<exclude name="components-*.properties"/>
+ <exclude name="WEB-INF/web-*.xml"/>
+ <exclude name="WEB-INF/web.xml"/>
</fileset>
<fileset dir="${basedir}/view"/>
</copy>
@@ -439,13 +441,13 @@
file="${basedir}/resources/import-test.sql"/>
<copy tofile="${test.dir}/components.properties"
file="${basedir}/resources/components-test.properties"/>
+ <copy tofile="${test.dir}/WEB-INF/web.xml"
+ file="${basedir}/resources/WEB-INF/web-test.xml"/>
<copy todir="${test.dir}" flatten="true">
<fileset dir="${src.test.dir}">
<include name="**/*Test.xml"/>
</fileset>
- </copy>
- <copy tofile="${test.dir}/components.properties"
- file="${basedir}/resources/components-test.properties"/>
+ </copy>
</target>
<target name="test" depends="buildtest" description="Run the tests">
Added: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web-test.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web-test.xml (rev 0)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/resources/WEB-INF/web-test.xml 2013-03-20 12:36:24 UTC (rev 15462)
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
+
+ <!-- Seam MockListener for JUnitSeamTest usage -->
+ <listener>
+ <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
+ </listener>
+
+</web-app>
11 years, 8 months
- 1
- 0
Seam SVN: r15461 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-03-20 08:36:14 -0400 (Wed, 20 Mar 2013)
New Revision: 15461
Modified:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java
Log:
removed unused import
Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java 2013-03-20 11:09:09 UTC (rev 15460)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java 2013-03-20 12:36:14 UTC (rev 15461)
@@ -23,7 +23,6 @@
import org.jboss.seam.test.integration.Deployments;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
11 years, 8 months
- 1
- 0
Seam SVN: r15460 - in branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam: annotations/bpm and 2 other directories.
by seam-commits＠lists.jboss.org
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
- */
-@Target(METHOD)
-@Retention(RUNTIME)
-@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
- */
-@Target(METHOD)
-@Retention(RUNTIME)
-@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
- */
-@Target(METHOD)
-@Retention(RUNTIME)
-@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
- */
-@Target(METHOD)
-@Retention(RUNTIME)
-@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
- */
-@Target( METHOD )
-@Retention( RUNTIME )
-@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
- */
-@Target(METHOD)
-@Retention(RUNTIME)
-@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
+}
11 years, 8 months
- 1
- 0