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

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-06-13 06:28:28 -0400 (Mon, 13 Jun 2011)
New Revision: 14531

Modified:
   spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java
Log:
[JBWS-3125] Merging changes to trunk


Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java	2011-06-12 04:40:25 UTC (rev 14530)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java	2011-06-13 10:28:28 UTC (rev 14531)
@@ -32,7 +32,7 @@
 {
    public enum DeploymentType
    {
-      JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3, JAXWS_JMS;
+      JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3, @Deprecated JAXWS_JMS;
    };
    
    public enum DeploymentState

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java	2011-06-12 04:40:25 UTC (rev 14530)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java	2011-06-13 10:28:28 UTC (rev 14531)
@@ -29,10 +29,8 @@
 public interface HttpEndpoint extends Endpoint
 {
    /** Get the URL pattern for this endpoint */
-   @Deprecated
    String getURLPattern();
    
    /** Set the URL pattern for this endpoint */
-   @Deprecated
    void setURLPattern(String urlPattern);
 }

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java	2011-06-12 04:40:25 UTC (rev 14530)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java	2011-06-13 10:28:28 UTC (rev 14531)
@@ -39,7 +39,8 @@
    //wsdl location
    private String wsdlLocation = "";
    
-
+   private String soapAddress = "";
+   
    //parent component 
    private JMSEndpointsMetaData endpointsMetaData = null;
 
@@ -93,4 +94,14 @@
       this.wsdlLocation = wsdlLocation;
    }
 
+   public String getSoapAddress()
+   {
+      return soapAddress;
+   }
+
+   public void setSoapAddress(String soapAddress)
+   {
+      this.soapAddress = soapAddress;
+   }
+
 }

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java	2011-06-12 04:40:25 UTC (rev 14530)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java	2011-06-13 10:28:28 UTC (rev 14531)
@@ -41,11 +41,13 @@
    {
    }
 
+   @Deprecated
    public JMSEndpointsMetaData(URL descriptorURL)
    {
       this.descriptorURL = descriptorURL;
    }
 
+   @Deprecated
    public URL getDescriptorURL()
    {
       return descriptorURL;