svn commit: r1352481 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/Assembler.java config/ConfigurationFactory.java

[rmannibucau]

Author: rmannibucau
Date: Thu Jun 21 09:42:37 2012
New Revision: 1352481

URL: http://svn.apache.org/viewvc?rev=1352481&view=rev
Log:
TOMEE-247 using class instead of type for inline service defintion

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1352481&r1=1352480&r2=1352481&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Thu Jun 21 09:42:37 2012
@@ -1896,6 +1896,8 @@ public class Assembler extends Assembler
             if (info.types.contains("javax.mail.Session")) return;
             //---
 
+            if (info.types.isEmpty() && "class".equalsIgnoreCase(property)) 
continue; // inline service (no sp)
+
             logger.getChildLogger("service").warning("unusedProperty", 
property, info.id);
         }
     }

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1352481&r1=1352480&r2=1352481&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 Thu Jun 21 09:42:37 2012
@@ -908,7 +908,11 @@ public class ConfigurationFactory implem
             */
 
             if (provider == null) { // mock it, service-jar.xml is just a pain 
for simple resources with no real default
-                provider = new ServiceProvider(service.getType(), 
service.getId(), providerType);
+                String type = service.getProperties().getProperty("class");
+                if (type == null) {
+                    type = service.getType();
+                }
+                provider = new ServiceProvider(type, service.getId(), 
providerType);
             }
 
             if (service.getId() == null) service.setId(provider.getId());