[jboss-cvs] JBossAS SVN: r61163 - branches/tdiesler/trunk/server/src/main/org/jboss/metamodel/descriptor.

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

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

Modified:
   branches/tdiesler/trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
Log:
partial commit

Modified: branches/tdiesler/trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-03-06 21:24:07 UTC (rev 61162)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-03-06 22:05:18 UTC (rev 61163)
@@ -24,12 +24,14 @@
 import javax.persistence.PersistenceContextType;
 import javax.xml.namespace.QName;
 
+import org.jboss.metadata.serviceref.CallPropertyMetaData;
 import org.jboss.metadata.serviceref.HandlerChainMetaData;
 import org.jboss.metadata.serviceref.HandlerChainsMetaData;
 import org.jboss.metadata.serviceref.HandlerMetaData;
 import org.jboss.metadata.serviceref.InitParamMetaData;
 import org.jboss.metadata.serviceref.PortComponentRefMetaData;
 import org.jboss.metadata.serviceref.ServiceRefMetaData;
+import org.jboss.metadata.serviceref.StubPropertyMetaData;
 import org.jboss.xb.binding.ObjectModelFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
 import org.xml.sax.Attributes;
@@ -318,33 +320,36 @@
          ref.setMappedName(getValue(localName, value));
       }
    }
+   
+   // ******************************************************** 
+   // START ServiceRefMetaData 
 
    public void setValue(ServiceRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
    {
       /* Standard properties */
       if (localName.equals("service-ref-name"))
       {
-         ref.setServiceRefName(getValue(localName, value));
+         ref.setServiceRefName(value);
       }
       else if (localName.equals("service-interface"))
       {
-         ref.setServiceInterface(getValue(localName, value));
+         ref.setServiceInterface(value);
       }
       else if (localName.equals("service-ref-type"))
       {
-         ref.setServiceRefType(getValue(localName, value));
+         ref.setServiceRefType(value);
       }
       else if (localName.equals("wsdl-file"))
       {
-         ref.setWsdlFile(getValue(localName, value));
+         ref.setWsdlFile(value);
       }
       else if (localName.equals("jaxrpc-mapping-file"))
       {
-         ref.setMappingFile(getValue(localName, value));
+         ref.setMappingFile(value);
       }
       else if (localName.equals("service-qname"))
       {
-         ref.setServiceQName(navigator.resolveQName(value));
+         ref.setServiceQName(QName.valueOf(value));
       }
 
       /* JBoss properties */
@@ -360,6 +365,10 @@
       {
          ref.setWsdlOverride(value);
       }
+      else if (localName.equals("handler-chain"))
+      {
+         ref.setHandlerChain(value);
+      }
    }
 
    public Object newChild(ServiceRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
@@ -371,6 +380,9 @@
          child = new HandlerMetaData();
       else if (localName.equals("handler-chains"))
          child = new HandlerChainsMetaData();
+      
+      else if (localName.equals("call-property"))
+         child = new CallPropertyMetaData();
 
       return child;
    }
@@ -399,6 +411,11 @@
       parent.setHandlerChains(handlerChains);
    }
 
+   public void addChild(ServiceRefMetaData parent, CallPropertyMetaData callProp, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addCallProperty(callProp);
+   }
+
    public void addChild(HandlerChainsMetaData parent, HandlerChainMetaData handlerChain, UnmarshallingContext navigator, String namespaceURI, String localName)
    {
       parent.addHandlerChain(handlerChain);
@@ -418,17 +435,31 @@
       {
          ref.setPortComponentLink(value);
       }
+      else if (localName.equals("port-qname"))
+      {
+         ref.setPortComponentLink(value);
+      }
    }
 
+   public Object newChild(PortComponentRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+      if (localName.equals("call-property"))
+         child = new CallPropertyMetaData();
+      if (localName.equals("stub-property"))
+         child = new StubPropertyMetaData();
+      return child;
+   }
+
    public void setValue(HandlerChainMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
    {
       if (localName.equals("service-name-pattern"))
       {
-         ref.setServiceNamePattern(value);
+         ref.setServiceNamePattern(QName.valueOf(value));
       }
       else if (localName.equals("port-name-pattern"))
       {
-         ref.setPortNamePattern(value);
+         ref.setPortNamePattern(QName.valueOf(value));
       }
       else if (localName.equals("protocol-binding"))
       {
@@ -486,40 +517,33 @@
       }
    }
 
-   public void setValue(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   public void setValue(CallPropertyMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
    {
-      if (localName.equals("service-endpoint-interface"))
+      if (localName.equals("prop-name"))
       {
-         portInfo.setServiceEndpointInterface(value);
+         ref.setPropName(value);
       }
-      else if (localName.equals("port-qname"))
+      else if (localName.equals("prop-value"))
       {
-         portInfo.setPortQName(QName.valueOf(value));
+         ref.setPropValue(value);
       }
-      else if (localName.equals("config-name"))
+   }
+
+   public void setValue(StubPropertyMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("prop-name"))
       {
-         portInfo.setConfigName(value);
+         ref.setPropName(value);
       }
-      else if (localName.equals("config-file"))
+      else if (localName.equals("prop-value"))
       {
-         portInfo.setConfigFile(value);
+         ref.setPropValue(value);
       }
    }
+   
+   // END ServiceRefMetaData 
+   // ******************************************************** 
 
-   public Object newChild(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
-   {
-      Object child = null;
-      if (localName.equals("stub-property"))
-         child = new NameValuePair();
-
-      return child;
-   }
-
-   public void addChild(PortInfo parent, NameValuePair stubProp, UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.getStubProperties().add(stubProp);
-   }
-
    public void setValue(NameValuePair nvPair, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
    {
       if (localName.equals("name"))