You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/05/06 11:13:52 UTC

[11/25] tomee git commit: random port for cdi-embedded

random port for cdi-embedded


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/272cb402
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/272cb402
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/272cb402

Branch: refs/heads/fb_tomee2_owb16
Commit: 272cb402a8a0ef2054607e38424676a8dfecf613
Parents: d8b80bf
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon May 4 20:55:13 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon May 4 20:55:13 2015 +0200

----------------------------------------------------------------------
 tck/cdi-embedded/pom.xml                           | 3 ++-
 tck/cdi-embedded/src/test/resources/arquillian.xml | 1 +
 tck/cdi-tomee/src/test/resources/arquillian.xml    | 1 +
 tck/cdi-tomee/src/test/resources/failing.xml       | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/272cb402/tck/cdi-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 95f0b3e..89b2a48 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -190,14 +190,15 @@
           <systemPropertyVariables>
             <cdiTckExcludeDummy>true</cdiTckExcludeDummy>
 
-            <jms>new://Resource?type=javax.jms.ConnectionFactory</jms>
             <queue>new://Resource?type=Queue</queue>
             <topic>new://Resource?type=Topic</topic>
             <jdbc>new://Resource?type=DataSource</jdbc>
+            <jms>new://Resource?type=javax.jms.ConnectionFactory</jms>
 
             <admin.disabled>true</admin.disabled>
             <ejbd.disabled>true</ejbd.disabled>
             <ejbds.disabled>true</ejbds.disabled>
+            <httpejbd.port>0</httpejbd.port> <!-- random port for http one -> CI friendly -->
 
             <openejb.cdi.applicationScope.cached>false</openejb.cdi.applicationScope.cached>
             <openejb.cdi.producer.interception>false</openejb.cdi.producer.interception>

http://git-wip-us.apache.org/repos/asf/tomee/blob/272cb402/tck/cdi-embedded/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/arquillian.xml b/tck/cdi-embedded/src/test/resources/arquillian.xml
index 0b46313..5047d58 100644
--- a/tck/cdi-embedded/src/test/resources/arquillian.xml
+++ b/tck/cdi-embedded/src/test/resources/arquillian.xml
@@ -26,6 +26,7 @@
       <property name="startDefaultScopes">false</property>
       <property name="properties">
         Default\ JMS\ Resource\ Adapter = new://Resource?type=ActiveMQResourceAdapter
+        Default\ JMS\ Resource\ Adapter.BrokerXmlConfig = broker:(tcp://localhost:0)?useJmx=false
 
         # used in TCKs
         jdbc = new://Resource?type=DataSource

http://git-wip-us.apache.org/repos/asf/tomee/blob/272cb402/tck/cdi-tomee/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/test/resources/arquillian.xml b/tck/cdi-tomee/src/test/resources/arquillian.xml
index de888b6..5bc7c42 100644
--- a/tck/cdi-tomee/src/test/resources/arquillian.xml
+++ b/tck/cdi-tomee/src/test/resources/arquillian.xml
@@ -42,6 +42,7 @@
         openejb.classloader.forced-load = org.apache.webbeans.test.tck.,org.apache.openejb.tck.cdi.tomee.
 
         jmsRa = new://Resource?type=ActiveMQResourceAdapter
+        jmsRa.BrokerXmlConfig = broker:(tcp://localhost:0)?useJmx=false
         jms = new://Resource?type=javax.jms.ConnectionFactory
         jms.ResourceAdapter = jmsRa
         queue = new://Resource?type=Queue

http://git-wip-us.apache.org/repos/asf/tomee/blob/272cb402/tck/cdi-tomee/src/test/resources/failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/test/resources/failing.xml b/tck/cdi-tomee/src/test/resources/failing.xml
index 23ceda0..b46f6e5 100644
--- a/tck/cdi-tomee/src/test/resources/failing.xml
+++ b/tck/cdi-tomee/src/test/resources/failing.xml
@@ -23,7 +23,7 @@
   -->
   <test name="CDI TCK for developers (debugging)">
     <classes>
-      <class name="org.jboss.cdi.tck.tests.deployment.shutdown.ApplicationShutdownLifecycleTest" />
+      <class name="org.jboss.cdi.tck.tests.context.session.listener.shutdown.SessionContextListenerShutdownTest" />
     </classes>
   </test>
 </suite>