Author: alessio.soldano(a)jboss.com
Date: 2011-06-16 12:59:37 -0400 (Thu, 16 Jun 2011)
New Revision: 14571
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
Log:
[JBWS-3312] svn merge -r 14552:14553
https://svn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.0.0.Beta5 .
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-06-16 15:25:31
UTC (rev 14570)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-06-16 16:59:37
UTC (rev 14571)
@@ -52,21 +52,6 @@
UNDEFINED, STARTED, STOPPED
};
- /** Get the URL pattern for this endpoint.
- * This has been deprecated, getting the current URLPatter
- * makes sense for {@link HttpEndpoint} only.
- */
- @Deprecated
- String getURLPattern();
- /** Set the URL pattern for this endpoint
- * This has been deprecated, setting the current URLPatter
- * makes sense for {@link HttpEndpoint} only.
- *
- * @param urlPattern
- */
- @Deprecated
- void setURLPattern(String urlPattern);
-
/** Get the service this endpoint belongs to */
Service getService();
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java 2011-06-16
15:25:31 UTC (rev 14570)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java 2011-06-16
16:59:37 UTC (rev 14571)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
- */
-package org.jboss.wsf.spi.deployment;
-
-/**
- * Provides the name of the servlet class to be used for generating
- * the ws endpoint deployment.
- *
- * @author alessio.soldano(a)jboss.com
- *
- */
-public interface ServletClassProvider
-{
- public String getServletClassName();
-}
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2011-06-16
15:25:31 UTC (rev 14570)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2011-06-16
16:59:37 UTC (rev 14571)
@@ -74,24 +74,6 @@
return serviceRefMetaData;
}
- /**
- * @deprecated Use {@link #isMtomEnabled()} instead.
- */
- @Deprecated
- public Boolean getEnableMTOM()
- {
- return mtomEnabled;
- }
-
- /**
- * @deprecated Use {@link #setMtomEnabled(boolean)} instead.
- */
- @Deprecated
- public void setEnableMTOM(Boolean enableMTOM)
- {
- this.mtomEnabled = enableMTOM;
- }
-
public void setAddressingEnabled(final boolean addressingEnabled) {
this.addressingEnabled = addressingEnabled;
}
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-06-16
15:25:31 UTC (rev 14570)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-06-16
16:59:37 UTC (rev 14571)
@@ -189,24 +189,6 @@
this.secureWSDLAccess = secureWSDLAccess;
}
- /**
- * @deprecated Use {@link #isMtomEnabled()} instead.
- */
- @Deprecated
- public boolean isEnableMtom()
- {
- return mtomEnabled;
- }
-
- /**
- * @deprecated Use {@link #setMtomEnabled(boolean)} instead.
- */
- @Deprecated
- public void setEnableMtom(boolean enableMtom)
- {
- this.mtomEnabled = enableMtom;
- }
-
public void setAddressingEnabled(final boolean addressingEnabled) {
this.addressingEnabled = addressingEnabled;
}