svn commit: r598009 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config: AnnotationDeployer.java JndiEncInfoBuilder.java

[kevan]

Author: kevan
Date: Sun Nov 25 08:58:50 2007
New Revision: 598009

URL: http://svn.apache.org/viewvc?rev=598009&view=rev
Log:
OPENEJB-718 Apply patch from Jarek Gawor. Thanks Jarek! Disable service-ref 
processing when running in embedded mode

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=598009&r1=598008&r2=598009&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 Sun Nov 25 08:58:50 2007
@@ -1254,6 +1254,7 @@
         }
 
         private void processWebServiceClientHandlers(JndiConsumer consumer, 
ClassLoader classLoader) throws OpenEJBException {
+            if (System.getProperty("duct tape") != null) return;
             Set<Class<?>> processedClasses = new HashSet<Class<?>>();
             Set<Class<?>> handlerClasses = new HashSet<Class<?>>();
             do {
@@ -1475,6 +1476,9 @@
                     serviceRef.setWsdlFile(wsdlLocation);
                 }
             }
+            
+            if (System.getProperty("duct tape") != null) return;
+            
             if (serviceRef.getWsdlFile() == null && refType != null) {
                 
serviceRef.setWsdlFile(JaxWsUtils.getServiceWsdlLocation(refType, classLoader));
             }

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=598009&r1=598008&r2=598009&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
 Sun Nov 25 08:58:50 2007
@@ -232,6 +232,12 @@
         for (ServiceRef ref : jndiConsumer.getServiceRef()) {
             ServiceReferenceInfo info = new ServiceReferenceInfo();
             info.referenceName = ref.getName();
+            info.location = buildLocationInfo(ref);
+            info.targets.addAll(buildInjectionInfos(ref));
+            infos.add(info);
+            
+            if (System.getProperty("duct tape") != null) continue;
+            
             info.id = ref.getMappedName();
             info.serviceQName = ref.getServiceQname();
             info.serviceType = ref.getServiceInterface();
@@ -247,9 +253,6 @@
                 
portRefInfo.properties.putAll(portComponentRef.getProperties());
                 info.portRefs.add(portRefInfo);
             }
-            info.location = buildLocationInfo(ref);
-            info.targets.addAll(buildInjectionInfos(ref));
-            infos.add(info);
         }
         return infos;
     }