[jboss-cvs] JBossAS SVN: r61167 - in branches/tdiesler/trunk/server/src/main/org/jboss/metadata: serviceref and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-03-06 18:07:06 -0500 (Tue, 06 Mar 2007)
New Revision: 61167

Modified:
   branches/tdiesler/trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java
   branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java
   branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java
Log:
partial

Modified: branches/tdiesler/trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java	2007-03-06 22:47:20 UTC (rev 61166)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java	2007-03-06 23:07:06 UTC (rev 61167)
@@ -23,7 +23,7 @@
 
 import javax.persistence.PersistenceContextType;
 
-import org.jboss.util.NotImplementedException;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
 import org.jboss.xb.binding.ObjectModelFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
 import org.xml.sax.Attributes;
@@ -431,7 +431,7 @@
       }
       else if (localName.equals("service-ref"))
       {
-         throw new NotImplementedException();
+         child = new ServiceRefMetaData();
       }
       else if (localName.equals("jndi-ref"))
       {

Modified: branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java	2007-03-06 22:47:20 UTC (rev 61166)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java	2007-03-06 23:07:06 UTC (rev 61167)
@@ -195,7 +195,8 @@
    Element toXMLFragment()
    {
       Element root = DocumentHelper.createElement("port-component-ref");
-      root.addElement("service-endpoint-interface").addText(serviceEndpointInterface);
+      if (serviceEndpointInterface != null)
+         root.addElement("service-endpoint-interface").addText(serviceEndpointInterface);
       if (enableMTOM != null)
          root.addElement("enable-mtom").addText(enableMTOM.toString());
       if (portComponentLink != null)

Modified: branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java	2007-03-06 22:47:20 UTC (rev 61166)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java	2007-03-06 23:07:06 UTC (rev 61167)
@@ -24,8 +24,6 @@
 // $Id$
 
 import java.io.Serializable;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;