svn commit: r1429589 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java

[rmannibucau]

Author: rmannibucau
Date: Sun Jan  6 20:07:26 2013
New Revision: 1429589

URL: http://svn.apache.org/viewvc?rev=1429589&view=rev
Log:
old configuration applicationcomposer api compatibility

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java?rev=1429589&r1=1429588&r2=1429589&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
 Sun Jan  6 20:07:26 2013
@@ -257,7 +257,10 @@ public final class ApplicationComposers 
             configuration.setProperty("logging.level.OpenEJB.server.http", 
"FINE");
         }
 
-        for (Method method : 
testClassFinder.findAnnotatedMethods(Configuration.class)) {
+        final List<Method> configs = new ArrayList<Method>();
+        
configs.addAll(testClassFinder.findAnnotatedMethods(Configuration.class));
+        
configs.addAll(testClassFinder.findAnnotatedMethods(org.apache.openejb.junit.Configuration.class));
+        for (Method method : configs) {
             final Object o = method.invoke(testInstance);
             if (o instanceof Properties) {
                 Properties properties = (Properties) o;