[jboss-svn-commits] JBoss Common SVN: r4773 - in arquillian/trunk: containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1 and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jul 18 13:57:58 EDT 2010
Author: aslak
Date: 2010-07-18 13:57:58 -0400 (Sun, 18 Jul 2010)
New Revision: 4773
Modified:
arquillian/trunk/containers/weld-ee-embedded-1.1/pom.xml
arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/ConversationLifeCycleCreator.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/ConversationLifeCycleDestoryer.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEEMockConfiguration.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEEMockContainer.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationConversationScopeTestCase.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/resources/arquillian.xml
arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/conversation/ConversationScopeTestCase.java
arquillian/trunk/examples/junit/src/test/resources/arquillian.xml
Log:
ARQ-185 Reverted to Weld 1.0.1-SP4, Removed Conversation Scope support until Weld 1.1 is released
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/pom.xml
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/pom.xml 2010-07-18 15:00:26 UTC (rev 4772)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/pom.xml 2010-07-18 17:57:58 UTC (rev 4773)
@@ -24,7 +24,7 @@
<properties>
<!-- Versioning -->
- <version.weld_core>1.0.2-SNAPSHOT</version.weld_core>
+ <version.weld_core>1.0.1-SP4</version.weld_core>
</properties>
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/ConversationLifeCycleCreator.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/ConversationLifeCycleCreator.java 2010-07-18 15:00:26 UTC (rev 4772)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/ConversationLifeCycleCreator.java 2010-07-18 17:57:58 UTC (rev 4773)
@@ -19,7 +19,6 @@
import org.jboss.arquillian.spi.Context;
import org.jboss.arquillian.spi.event.Event;
import org.jboss.arquillian.spi.event.suite.EventHandler;
-import org.jboss.weld.conversation.ConversationManager2;
import org.jboss.weld.manager.api.WeldManager;
/**
@@ -41,6 +40,7 @@
throw new IllegalStateException("No " + WeldManager.class.getName() + " found in context");
}
+ /* Revert until 1.1 Weld is released.. https://jira.jboss.org/browse/ARQ-185
ConversationManager2 conversationManager = BeanUtils.getBeanReference(manager, ConversationManager2.class);
CDIConversationID id = context.get(CDIConversationID.class);
if(id == null)
@@ -53,5 +53,6 @@
conversationManager.setupContext();
}
conversationManager.setupConversation(id.getId());
+ */
}
}
\ No newline at end of file
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/ConversationLifeCycleDestoryer.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/ConversationLifeCycleDestoryer.java 2010-07-18 15:00:26 UTC (rev 4772)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/ConversationLifeCycleDestoryer.java 2010-07-18 17:57:58 UTC (rev 4773)
@@ -21,7 +21,6 @@
import org.jboss.arquillian.spi.Context;
import org.jboss.arquillian.spi.event.Event;
import org.jboss.arquillian.spi.event.suite.EventHandler;
-import org.jboss.weld.conversation.ConversationManager2;
import org.jboss.weld.manager.api.WeldManager;
/**
@@ -49,8 +48,9 @@
context.add(CDIConversationID.class, new CDIConversationID(null));
}
+ /* Revert until 1.1 Weld is released.. https://jira.jboss.org/browse/ARQ-185
ConversationManager2 conversationManager = BeanUtils.getBeanReference(manager, ConversationManager2.class);
conversationManager.teardownConversation();
- //conversationManager.teardownContext();
+ */
}
}
\ No newline at end of file
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEEMockConfiguration.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEEMockConfiguration.java 2010-07-18 15:00:26 UTC (rev 4772)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEEMockConfiguration.java 2010-07-18 17:57:58 UTC (rev 4773)
@@ -30,13 +30,14 @@
/**
* Flag to enable the Conversation Scope outside a JSF Request
*/
- private boolean enableConversationScope = false;
+ //private boolean enableConversationScope = false;
public ContainerProfile getContainerProfile()
{
return ContainerProfile.STANDALONE;
}
+/* Revert until 1.1 Weld is released.. https://jira.jboss.org/browse/ARQ-185
public void setEnableConversationScope(boolean enableConversationScope)
{
this.enableConversationScope = enableConversationScope;
@@ -46,4 +47,5 @@
{
return enableConversationScope;
}
+*/
}
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEEMockContainer.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEEMockContainer.java 2010-07-18 15:00:26 UTC (rev 4772)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEEMockContainer.java 2010-07-18 17:57:58 UTC (rev 4773)
@@ -62,9 +62,12 @@
public ContainerMethodExecutor deploy(Context context, Archive<?> archive) throws DeploymentException
{
+ /* Revert until 1.1 Weld is released.. https://jira.jboss.org/browse/ARQ-185
boolean enableConversation = context.get(Configuration.class)
.getContainerConfig(WeldEEMockConfiguration.class)
.isEnableConversationScope();
+ */
+ boolean enableConversation = false;
ShrinkwrapBeanDeploymentArchive beanArchive = archive.as(ShrinkwrapBeanDeploymentArchive.class);
MockEELifecycle lifecycle = new MockEELifecycle(beanArchive);
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationConversationScopeTestCase.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationConversationScopeTestCase.java 2010-07-18 15:00:26 UTC (rev 4772)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationConversationScopeTestCase.java 2010-07-18 17:57:58 UTC (rev 4773)
@@ -38,6 +38,7 @@
* @author <a href="mailto:aslak at redhat.com">Aslak Knutsen</a>
* @version $Revision: $
*/
+// Revert until 1.1 Weld is released.. https://jira.jboss.org/browse/ARQ-185
@Ignore // Can't guarantee method order in JUnit
@RunWith(Arquillian.class)
public class WeldEmbeddedIntegrationConversationScopeTestCase
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/resources/arquillian.xml
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/resources/arquillian.xml 2010-07-18 15:00:26 UTC (rev 4772)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/resources/arquillian.xml 2010-07-18 17:57:58 UTC (rev 4773)
@@ -4,7 +4,9 @@
xmlns:weld="urn:arq:org.jboss.arquillian.container.weld.ee.embedded_1_1">
<weld:container>
+<!-- Revert until 1.1 Weld is released.. https://jira.jboss.org/browse/ARQ-185
<weld:enableConversationScope>true</weld:enableConversationScope>
+ -->
</weld:container>
</arquillian>
\ No newline at end of file
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/conversation/ConversationScopeTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/conversation/ConversationScopeTestCase.java 2010-07-18 15:00:26 UTC (rev 4772)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/conversation/ConversationScopeTestCase.java 2010-07-18 17:57:58 UTC (rev 4773)
@@ -26,6 +26,7 @@
import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,6 +37,7 @@
* @author <a href="mailto:aslak at redhat.com">Aslak Knutsen</a>
* @version $Revision: $
*/
+ at Ignore // Revert until 1.1 Weld is released.. https://jira.jboss.org/browse/ARQ-185
@RunWith(Arquillian.class)
public class ConversationScopeTestCase
{
Modified: arquillian/trunk/examples/junit/src/test/resources/arquillian.xml
===================================================================
--- arquillian/trunk/examples/junit/src/test/resources/arquillian.xml 2010-07-18 15:00:26 UTC (rev 4772)
+++ arquillian/trunk/examples/junit/src/test/resources/arquillian.xml 2010-07-18 17:57:58 UTC (rev 4773)
@@ -5,7 +5,9 @@
xmlns:weldee="urn:arq:org.jboss.arquillian.container.weld.ee.embedded_1_1">
<weldee:container>
+<!-- Revert until 1.1 Weld is released.. https://jira.jboss.org/browse/ARQ-185
<enableConversationScope>true</enableConversationScope>
+-->
</weldee:container>
</arquillian>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list