[jboss-svn-commits] JBoss Common SVN: r4503 - in arquillian/trunk: containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60 and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 11 12:34:35 EDT 2010
Author: aslak
Date: 2010-06-11 12:34:33 -0400 (Fri, 11 Jun 2010)
New Revision: 4503
Modified:
arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishDeploymentAppender.java
arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASDeploymentAppender.java
arquillian/trunk/containers/jbossas-local-60/src/main/java/org/jboss/arquillian/jbossas/local60/JBossASDeploymentAppender.java
arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jbossas/remote60/JBossASDeploymentAppender.java
arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/DynamicServiceLoaderTestCase.java
arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/ServiceLoader.java
Log:
ARQ-175 Fixed the order of Enrichers to follow the order defined in services metadata file. For EE6 the order is; CDI, EJB, Resources
Modified: arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishDeploymentAppender.java 2010-06-11 15:42:04 UTC (rev 4502)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishDeploymentAppender.java 2010-06-11 16:34:33 UTC (rev 4503)
@@ -46,9 +46,9 @@
CDIInjectionEnricher.class.getPackage())
.addServiceProvider(
TestEnricher.class,
+ CDIInjectionEnricher.class,
EJBInjectionEnricher.class,
- ResourceInjectionEnricher.class,
- CDIInjectionEnricher.class);
+ ResourceInjectionEnricher.class);
return archive;
}
Modified: arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASDeploymentAppender.java 2010-06-11 15:42:04 UTC (rev 4502)
+++ arquillian/trunk/containers/jbossas-embedded-60/src/main/java/org/jboss/arquillian/jbossas/embedded60/JBossASDeploymentAppender.java 2010-06-11 16:34:33 UTC (rev 4503)
@@ -50,9 +50,9 @@
CDIInjectionEnricher.class.getPackage())
.addServiceProvider(
TestEnricher.class,
+ CDIInjectionEnricher.class,
EJBInjectionEnricher.class,
- ResourceInjectionEnricher.class,
- CDIInjectionEnricher.class);
+ ResourceInjectionEnricher.class);
return archive;
}
Modified: arquillian/trunk/containers/jbossas-local-60/src/main/java/org/jboss/arquillian/jbossas/local60/JBossASDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-local-60/src/main/java/org/jboss/arquillian/jbossas/local60/JBossASDeploymentAppender.java 2010-06-11 15:42:04 UTC (rev 4502)
+++ arquillian/trunk/containers/jbossas-local-60/src/main/java/org/jboss/arquillian/jbossas/local60/JBossASDeploymentAppender.java 2010-06-11 16:34:33 UTC (rev 4503)
@@ -47,9 +47,9 @@
CDIInjectionEnricher.class.getPackage())
.addServiceProvider(
TestEnricher.class,
+ CDIInjectionEnricher.class,
EJBInjectionEnricher.class,
- ResourceInjectionEnricher.class,
- CDIInjectionEnricher.class);
+ ResourceInjectionEnricher.class);
return archive;
}
Modified: arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jbossas/remote60/JBossASDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jbossas/remote60/JBossASDeploymentAppender.java 2010-06-11 15:42:04 UTC (rev 4502)
+++ arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jbossas/remote60/JBossASDeploymentAppender.java 2010-06-11 16:34:33 UTC (rev 4503)
@@ -47,9 +47,9 @@
CDIInjectionEnricher.class.getPackage())
.addServiceProvider(
TestEnricher.class,
+ CDIInjectionEnricher.class,
EJBInjectionEnricher.class,
- ResourceInjectionEnricher.class,
- CDIInjectionEnricher.class);
+ ResourceInjectionEnricher.class);
return archive;
}
Modified: arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/DynamicServiceLoaderTestCase.java
===================================================================
--- arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/DynamicServiceLoaderTestCase.java 2010-06-11 15:42:04 UTC (rev 4502)
+++ arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/DynamicServiceLoaderTestCase.java 2010-06-11 16:34:33 UTC (rev 4503)
@@ -55,6 +55,35 @@
2, services.size());
}
+ @Test
+ public void shouldReturnDefinedOrderInServicesFile() throws Exception
+ {
+ for(int i = 0; i < 10; i++)
+ {
+ Collection<Service> services = new DynamicServiceLoader().all(Service.class);
+ verifyOrder(services);
+ }
+ }
+
+ private void verifyOrder(Collection<Service> services)
+ {
+ int i = 0;
+ for(Service service : services)
+ {
+ switch(i)
+ {
+ case 0:
+ Assert.assertEquals(service.getClass(), ServiceImpl1.class);
+ break;
+ case 1:
+ Assert.assertEquals(service.getClass(), ServiceImpl2.class);
+ break;
+ }
+ i++;
+ }
+ }
+
+
public interface Service {}
public static class ServiceImpl1 implements Service {}
public static class ServiceImpl2 implements Service {}
Modified: arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/ServiceLoader.java
===================================================================
--- arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/ServiceLoader.java 2010-06-11 15:42:04 UTC (rev 4502)
+++ arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/ServiceLoader.java 2010-06-11 16:34:33 UTC (rev 4503)
@@ -24,8 +24,8 @@
import java.net.URL;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Set;
/**
@@ -138,7 +138,7 @@
*/
public void reload()
{
- providers = new HashSet<S>();
+ providers = new LinkedHashSet<S>();
Enumeration<URL> enumeration = null;
boolean errorOccurred = false;
More information about the jboss-svn-commits
mailing list