[jbossws-commits] JBossWS SVN: r14572 - in common/trunk/src/main/java/org/jboss/ws/common: integration and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-06-16 13:00:32 -0400 (Thu, 16 Jun 2011)
New Revision: 14572

Modified:
   common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java
   common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java
   common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java
Log:
[JBWS-3312] svn merge -r 14556:14557 https://svn.jboss.org/repos/jbossws/common/tags/jbossws-common-2.0.0.Beta4 .


Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java	2011-06-16 16:59:37 UTC (rev 14571)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java	2011-06-16 17:00:32 UTC (rev 14572)
@@ -24,7 +24,6 @@
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.jboss.logging.Logger;
 import org.jboss.wsf.spi.deployment.HttpEndpoint;
 import org.jboss.wsf.spi.management.EndpointMetrics;
 
@@ -36,8 +35,6 @@
 public class DefaultHttpEndpoint extends AbstractDefaultEndpoint implements HttpEndpoint
 {
 
-   private static final Logger log = Logger.getLogger(DefaultHttpEndpoint.class);
-
    DefaultHttpEndpoint(String targetBean)
    {
       super(targetBean);

Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java	2011-06-16 16:59:37 UTC (rev 14571)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java	2011-06-16 17:00:32 UTC (rev 14572)
@@ -45,18 +45,6 @@
       super(targetBean);
    }
    
-   @Deprecated 
-   public String getURLPattern()
-   {
-      throw new UnsupportedOperationException();
-   }
-
-   @Deprecated
-   public void setURLPattern(String urlPattern)
-   {
-      throw new UnsupportedOperationException();
-   }
-
    public String getTargetDestination()
    {
       return targetDestination;
@@ -102,7 +90,6 @@
       return super.getAddress();  
    }
 
-   //TODO:enable jms endpoint management
    @Override
    public EndpointMetrics getEndpointMetrics()
    {

Modified: common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java	2011-06-16 16:59:37 UTC (rev 14571)
+++ common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java	2011-06-16 17:00:32 UTC (rev 14572)
@@ -135,17 +135,6 @@
    }
    
    /**
-    * Returns true if deployment represents JAXWS JMS deployment.
-    *
-    * @param dep webservice deployment
-    * @return true if JAXWS JMS deployment, false otherwise
-    */
-   public static boolean isJaxwsJmsDeployment( final Deployment dep )
-   {
-      return DeploymentType.JAXWS_JMS.equals( dep.getType() );
-   }
-
-   /**
     * Returns true if deployment represents either JAXWS JSE or JAXRPC JSE deployment.
     *
     * @param dep webservice deployment