[weld-commits] Weld SVN: r6083 - in core/trunk: tests/src/test/java/org/jboss/weld/tests/proxy/weld56 and 3 other directories.

[weld-commits at lists.jboss.org]

Author: nickarls
Date: 2010-04-09 07:28:53 -0400 (Fri, 09 Apr 2010)
New Revision: 6083

Added:
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/proxy/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/proxy/weld56/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/proxy/weld56/org.jboss.weld.enableUnsafeProxies
Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/InstantiatorFactory.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java
Log:
WELD-56

Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/InstantiatorFactory.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/InstantiatorFactory.java	2010-04-08 11:55:46 UTC (rev 6082)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/InstantiatorFactory.java	2010-04-09 11:28:53 UTC (rev 6083)
@@ -19,7 +19,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jboss.weld.Container;
 import org.jboss.weld.bootstrap.api.Service;
+import org.jboss.weld.resources.spi.ResourceLoader;
 
 /**
  * A factory class for obtaining the first available instantiator
@@ -31,6 +33,7 @@
 public class InstantiatorFactory implements Service
 {
    private static Instantiator availableInstantiator;
+   private static boolean enabled;
 
    private static final List<Instantiator> instantiators = new ArrayList<Instantiator>()
    {
@@ -50,6 +53,7 @@
             break;
          }
       }
+      enabled = Container.instance().services().get(ResourceLoader.class).getResource("META-INF/org.jboss.weld.enableUnsafeProxies") != null;
    }
 
    public static Instantiator getInstantiator()
@@ -59,7 +63,7 @@
    
    public static boolean useInstantiators() 
    {
-      return "true".equals(System.getProperty("org.jboss.weld.instantiators"));
+      return enabled;
    }
 
    public void cleanup()

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java	2010-04-08 11:55:46 UTC (rev 6082)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java	2010-04-09 11:28:53 UTC (rev 6083)
@@ -1,14 +1,21 @@
 package org.jboss.weld.tests.proxy.weld56;
 
 import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.Resource;
 import org.jboss.weld.test.AbstractWeldTest;
 import org.testng.annotations.Test;
 
 @Artifact
+ at IntegrationTest
+ at Packaging(PackagingType.WAR)
+ at Resource(source = "org.jboss.weld.enableUnsafeProxies", destination = "WEB-INF/classes/META-INF/org.jboss.weld.enableUnsafeProxies")
 public class ProxyTest extends AbstractWeldTest
 {
 
-   @Test(groups="broken")
+   @Test
    public void testProxy()
    {
       assert "ping".equals(getReference(Foo.class).ping());

Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/proxy/weld56/org.jboss.weld.enableUnsafeProxies
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/proxy/weld56/org.jboss.weld.enableUnsafeProxies	                        (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/proxy/weld56/org.jboss.weld.enableUnsafeProxies	2010-04-09 11:28:53 UTC (rev 6083)
@@ -0,0 +1 @@
+#
\ No newline at end of file