You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2012/09/26 11:49:15 UTC
svn commit: r1390357 - in
/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb:
core/mdb/JmsTest.java persistence/ResourceLocalCdiEmTest.java
persistence/ResourceLocalEmInjectionTest.java
Author: jlmonteiro
Date: Wed Sep 26 09:49:14 2012
New Revision: 1390357
URL: http://svn.apache.org/viewvc?rev=1390357&view=rev
Log:
Fixing JULLoggerFactory issue on Mac
Modified:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java?rev=1390357&r1=1390356&r2=1390357&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java Wed Sep 26 09:49:14 2012
@@ -44,7 +44,7 @@ public class JmsTest extends TestCase {
protected static final String REQUEST_QUEUE_NAME = "request";
protected ConnectionFactory connectionFactory;
protected ActiveMQResourceAdapter ra;
- protected String brokerAddress = NetworkUtil.getLocalAddress("tcp://", "");
+ protected String brokerAddress = "tcp://127.0.0.1:61616";//NetworkUtil.getLocalAddress("tcp://", "");
protected String brokerXmlConfig = "broker:(" + brokerAddress + ")?useJmx=false";
@Override
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java?rev=1390357&r1=1390356&r2=1390357&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java Wed Sep 26 09:49:14 2012
@@ -46,11 +46,6 @@ public class ResourceLocalCdiEmTest {
@Inject
private PersistManager persistManager;
- public void setUp() {
- //avoid linkage error on mac, only used for tests so don't need to add it in Core
- JULLoggerFactory.class.getName();
- }
-
@Test
public void injection() {
assertNotNull(persistManager);
@@ -59,6 +54,9 @@ public class ResourceLocalCdiEmTest {
@Configuration
public Properties config() {
+ //avoid linkage error on mac, only used for tests so don't need to add it in Core
+ JULLoggerFactory.class.getName();
+
final Properties p = new Properties();
p.put("ResourceLocalCdiEmTest", "new://Resource?type=DataSource");
p.put("ResourceLocalCdiEmTest.JdbcDriver", "org.hsqldb.jdbcDriver");
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java?rev=1390357&r1=1390356&r2=1390357&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java Wed Sep 26 09:49:14 2012
@@ -42,11 +42,6 @@ public class ResourceLocalEmInjectionTes
@EJB
private PersistManager persistManager;
- public void setUp() {
- //avoid linkage error on mac, only used for tests so don't need to add it in Core
- JULLoggerFactory.class.getName();
- }
-
@Test
public void injection2Validator() {
assertNotNull(persistManager);
@@ -55,6 +50,9 @@ public class ResourceLocalEmInjectionTes
@Configuration
public Properties config() {
+ //avoid linkage error on mac, only used for tests so don't need to add it in Core
+ JULLoggerFactory.class.getName();
+
final Properties p = new Properties();
p.put("ResourceLocalEmInjectionTest", "new://Resource?type=DataSource");
p.put("ResourceLocalEmInjectionTest.JdbcDriver", "org.hsqldb.jdbcDriver");