[jbossws-commits] JBossWS SVN: r12057 - in spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints: jms and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: jim.ma
Date: 2010-04-20 22:42:37 -0400 (Tue, 20 Apr 2010)
New Revision: 12057

Modified:
   spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointMetaData.java
   spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsFactory.java
   spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsMetaData.java
   spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSAddressMetaData.java
   spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSDestinationMetaData.java
Log:
[JBWS-2791]:Refactored code

Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointMetaData.java	2010-04-20 20:19:42 UTC (rev 12056)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointMetaData.java	2010-04-21 02:42:37 UTC (rev 12057)
@@ -63,7 +63,7 @@
       return addressMetaData;
    }
 
-   public EndpointsMetaData getEndpointsMetaData()
+   public EndpointsMetaData getParentMetaData()
    {
       return endpointsMetaData;
    }

Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsFactory.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsFactory.java	2010-04-20 20:19:42 UTC (rev 12056)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsFactory.java	2010-04-21 02:42:37 UTC (rev 12057)
@@ -179,7 +179,9 @@
       if (JMSAddressMetaData.NAMESPACE_URI.equals(namespaceURI)
             && JMSAddressMetaData.ADDRESS_LOCAL_NAME.equals(localName))
       {
-         return new JMSAddressMetaData(endpoint);
+         JMSAddressMetaData jmsMetaData =  new JMSAddressMetaData(endpoint);
+         jmsMetaData.setPortName(attrs.getValue("portName"));
+         return jmsMetaData;
       }
 
       else
@@ -204,14 +206,12 @@
       if ("requestDestination".equals(localName))
       {
          JMSDestinationMetaData requestDest = new JMSDestinationMetaData();
-         requestDest.setName(attrs.getValue("name"));
          jmsAddress.setRequestDestination(requestDest);
          return requestDest;
       }
       else if ("replyDestination".equals(localName))
       {
          JMSDestinationMetaData replyDest = new JMSDestinationMetaData();
-         replyDest.setName(attrs.getValue("name"));
          jmsAddress.setReplyDestination(replyDest);
          return replyDest;
       }

Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsMetaData.java	2010-04-20 20:19:42 UTC (rev 12056)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/EndpointsMetaData.java	2010-04-21 02:42:37 UTC (rev 12057)
@@ -23,6 +23,7 @@
 
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>Stack independent top level meta data class from jbossws-endpoints.xml. </p>
@@ -55,7 +56,7 @@
 public class EndpointsMetaData
 {
    //The endpoints list
-   private ArrayList<EndpointMetaData> endpointsMetaData = new ArrayList<EndpointMetaData>();
+   private List<EndpointMetaData> endpointsMetaData = new ArrayList<EndpointMetaData>();
 
    //The jbossws-endpoint.xml location
    private URL descriptorURL;
@@ -78,4 +79,8 @@
    {
       endpointsMetaData.add(endpointMetaData);
    }
+   
+   public List<EndpointMetaData> getEndpointsMetaData() {
+      return this.endpointsMetaData;
+   }
 }

Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSAddressMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSAddressMetaData.java	2010-04-20 20:19:42 UTC (rev 12056)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSAddressMetaData.java	2010-04-21 02:42:37 UTC (rev 12057)
@@ -40,6 +40,8 @@
    private JMSDestinationMetaData requestDestination;
 
    private JMSDestinationMetaData replyDestination;
+   
+   private String portName= "";
 
    public JMSAddressMetaData(EndpointMetaData endpoint)
    {
@@ -70,4 +72,14 @@
    {
       this.requestDestination = requestDestination;
    }
+   
+   public String getPortName()
+   {
+      return portName;
+   }
+
+   public void setPortName(String portName)
+   {
+      this.portName = portName;
+   }
 }

Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSDestinationMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSDestinationMetaData.java	2010-04-20 20:19:42 UTC (rev 12056)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/jms/JMSDestinationMetaData.java	2010-04-21 02:42:37 UTC (rev 12057)
@@ -30,8 +30,6 @@
  */
 public class JMSDestinationMetaData
 {
-   private String name;
-
    private Properties properties = new Properties();;
 
    public JMSDestinationMetaData()
@@ -39,16 +37,6 @@
 
    }
 
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-
    public void setProperty(String name, String value)
    {
       properties.put(name, value);