[jbossws-commits] JBossWS SVN: r5475 - in framework/trunk: src/main/java/org/jboss/wsf/framework/serviceref and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-01-16 04:26:39 -0500 (Wed, 16 Jan 2008)
New Revision: 5475

Modified:
   framework/trunk/framework.iml
   framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/ServiceRefObjectFactory.java
Log:
Fix JBWS1841: WebServiceRef injection from DD doesn't work. Added parsing of injection-target properties

Modified: framework/trunk/framework.iml
===================================================================
--- framework/trunk/framework.iml	2008-01-16 09:23:35 UTC (rev 5474)
+++ framework/trunk/framework.iml	2008-01-16 09:26:39 UTC (rev 5475)
@@ -21,15 +21,6 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi-src.zip!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
           <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding.jar!/" />
         </CLASSES>
         <JAVADOC />
@@ -39,15 +30,6 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
           <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" />
         </CLASSES>
         <JAVADOC />
@@ -171,6 +153,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="spi" />
     <orderEntryProperties />
   </component>
 </module>

Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/ServiceRefObjectFactory.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/ServiceRefObjectFactory.java	2008-01-16 09:23:35 UTC (rev 5474)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/ServiceRefObjectFactory.java	2008-01-16 09:26:39 UTC (rev 5475)
@@ -37,6 +37,8 @@
 import org.jboss.xb.binding.UnmarshallingContext;
 import org.xml.sax.Attributes;
 
+import java.util.Set;
+
 /**
  * A object model factory for <service-ref>
  * 
@@ -105,6 +107,14 @@
       {
          ref.setServiceQName(getQNameValue(navigator, value));
       }
+      else if (localName.equals("injection-target-class"))
+      {
+         ref.registerInjectionTarget(value);
+      }
+      else if (localName.equals("injection-target-name"))
+      {
+         ref.finalizeInjectionTarget(value);
+      }
 
       /* JBoss properties */
       else if (localName.equals("service-impl-class"))
@@ -151,7 +161,7 @@
       {
          child = new UnifiedCallPropertyMetaData();
          ref.addCallProperty((UnifiedCallPropertyMetaData)child);
-      }
+      }      
       return child;
    }