Author: jlmonteiro
Date: Wed Sep 26 08:56:40 2012
New Revision: 1390337
URL: http://svn.apache.org/viewvc?rev=1390337&view=rev
Log:
Add JULLoggerFactory on tests to avoid LinkageError on Mac
Modified:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientSubclassTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.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/config/LocalClientNoInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java?rev=1390337&r1=1390336&r2=1390337&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java
Wed Sep 26 08:56:40 2012
@@ -25,6 +25,7 @@ import org.apache.openejb.core.LocalInit
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.apache.webbeans.logger.JULLoggerFactory;
import javax.ejb.Local;
import javax.ejb.Remote;
@@ -37,7 +38,11 @@ import java.util.Properties;
public class LocalClientNoInjectionTest extends TestCase {
+
public void setUp() throws OpenEJBException, NamingException, IOException {
+ //avoid linkage error on mac, only used for tests so don't need to add
it in Core
+ JULLoggerFactory.class.getName();
+
ConfigurationFactory config = new ConfigurationFactory();
Assembler assembler = new Assembler();
Modified:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientSubclassTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientSubclassTest.java?rev=1390337&r1=1390336&r2=1390337&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientSubclassTest.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientSubclassTest.java
Wed Sep 26 08:56:40 2012
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
import org.apache.openejb.core.LocalInitialContextFactory;
+import org.apache.webbeans.logger.JULLoggerFactory;
import javax.naming.InitialContext;
import java.util.Properties;
@@ -26,9 +27,13 @@ import java.util.Properties;
*/
public class LocalClientSubclassTest extends LocalClientTest {
+ public void setUp() {
+ //avoid linkage error on mac, only used for tests so don't need to add
it in Core
+ JULLoggerFactory.class.getName();
+ }
+
@Override
public void test() throws Exception {
-
Properties properties = new Properties();
properties.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
LocalInitialContextFactory.class.getName());
InitialContext context = new InitialContext(properties);
Modified:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java?rev=1390337&r1=1390336&r2=1390337&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java
Wed Sep 26 08:56:40 2012
@@ -25,6 +25,7 @@ import org.apache.openejb.core.LocalInit
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.apache.webbeans.logger.JULLoggerFactory;
import javax.ejb.Local;
import javax.ejb.Remote;
@@ -80,6 +81,9 @@ public class LocalClientTest extends Tes
private EntityManager em;
public void setUp() throws OpenEJBException, NamingException, IOException {
+ //avoid linkage error on mac, only used for tests so don't need to add
it in Core
+ JULLoggerFactory.class.getName();
+
ConfigurationFactory config = new ConfigurationFactory();
Assembler assembler = new Assembler();
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=1390337&r1=1390336&r2=1390337&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 08:56:40 2012
@@ -34,6 +34,7 @@ import org.apache.openejb.jee.jpa.unit.T
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.junit.Configuration;
import org.apache.openejb.junit.Module;
+import org.apache.webbeans.logger.JULLoggerFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,6 +46,11 @@ 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);
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=1390337&r1=1390336&r2=1390337&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 08:56:40 2012
@@ -30,6 +30,7 @@ import org.apache.openejb.jee.jpa.unit.T
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.junit.Configuration;
import org.apache.openejb.junit.Module;
+import org.apache.webbeans.logger.JULLoggerFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,6 +42,11 @@ 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);
