You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ba...@apache.org on 2008/04/22 02:13:07 UTC
svn commit: r650327 - in
/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description:
builder/DescriptionBuilderComposite.java impl/EndpointDescriptionImpl.java
impl/ServiceDescriptionImpl.java
Author: barrettj
Date: Mon Apr 21 17:13:06 2008
New Revision: 650327
URL: http://svn.apache.org/viewvc?rev=650327&view=rev
Log:
Remove deprecated methods no longer needed to create a ServiceDescription from an AxisService and endpoint implementation class.
The factory method that called these methods was removed in revision 646585
Modified:
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java?rev=650327&r1=650326&r2=650327&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java Mon Apr 21 17:13:06 2008
@@ -734,31 +734,6 @@
return catalogManager;
}
- /**
- * @deprecated
- */
- private boolean isDeprecatedServiceProviderConstruction = false;
- /**
- * Answer if this composite represents a service provider that was constructed using the
- * deprecated path (used for testing only and being removed). Once that deprecated path
- * is removed, this method and all code blocks referencing it can be removed.
- *
- * @see org.apache.axis2.jaxws.description.DescriptionFactory.createServiceDescriptionFromServiceImpl
- *
- * @deprecated
- * @return true if the this was constructed with the deprecated logic
- */
- public boolean isDeprecatedServiceProviderConstruction() {
- return isDeprecatedServiceProviderConstruction;
- }
- /**
- * @deprecated
- * @param value
- */
- public void setIsDeprecatedServiceProviderConstruction(boolean value) {
- isDeprecatedServiceProviderConstruction = value;
- }
-
public void setProperties(Map<String, Object> properties) {
this.properties = properties;
}
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?rev=650327&r1=650326&r2=650327&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java Mon Apr 21 17:13:06 2008
@@ -566,47 +566,6 @@
releaseAxisServiceResources();
}
- /**
- * Create a service-provider side EndpointDescription from an annotated implementation class. Note this is
- * currently used only on the server-side (this probably won't change).
- *
- * @param theClass An implemntation or SEI class
- * @param portName May be null; if so the annotation is used
- * @param parent
- *
- * @deprecated
- */
- EndpointDescriptionImpl(Class theClass, QName portName, AxisService axisService,
- ServiceDescriptionImpl parent) {
- this.parentServiceDescription = parent;
- composite = new DescriptionBuilderComposite();
- composite.setIsDeprecatedServiceProviderConstruction(true);
- composite.setIsServiceProvider(true);
- this.portQName = portName;
- composite.setCorrespondingClass(theClass);
- ClassLoader loader = (ClassLoader) AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
- return this.getClass().getClassLoader();
- }
- }
- );
- composite.setClassLoader(loader);
- this.axisService = axisService;
-
- addToAxisService();
-
- buildEndpointDescriptionFromAnnotations();
-
- configureWebServiceFeatures();
- // This constructor isn't used anymore, so there's no need to do this
-// releaseAxisServiceResources();
-
- // The anonymous AxisOperations are currently NOT added here. The reason
- // is that (for now) this is a SERVER-SIDE code path, and the anonymous operations
- // are only needed on the client side.
- }
-
private void addToAxisService() {
// Add a reference to this EndpointDescription object to the AxisService
if (axisService != null) {
@@ -640,19 +599,6 @@
// - The @WebService and @WebServiceProvider annotations can not appear in the same class per
// JAX-WS section 7.7 on page 82.
- // Verify that one (and only one) of the required annotations is present.
- // TODO: Add tests to verify this error checking
-
- if (composite.isDeprecatedServiceProviderConstruction()) {
-
- webServiceAnnotation = composite.getWebServiceAnnot();
- webServiceProviderAnnotation = composite.getWebServiceProviderAnnot();
-
- if (webServiceAnnotation == null && webServiceProviderAnnotation == null)
- throw ExceptionFactory.makeWebServiceException(Messages.getMessage("endpointDescriptionErr6",composite.getClassName()));
- else if (webServiceAnnotation != null && webServiceProviderAnnotation != null)
- throw ExceptionFactory.makeWebServiceException(Messages.getMessage("endpointDescriptionErr7",composite.getClassName()));
- }
// If portName was specified, set it. Otherwise, we will get it from the appropriate
// annotation when the getter is called.
// TODO: If the portName is specified, should we verify it against the annotation?
@@ -669,9 +615,7 @@
// that this is also called with just an SEI interface from svcDesc.updateWithSEI()
String seiClassName = getAnnoWebServiceEndpointInterface();
- if (composite.isDeprecatedServiceProviderConstruction()
- || !composite.isServiceProvider()) {
-// if (!getServiceDescriptionImpl().isDBCMap()) {
+ if (!composite.isServiceProvider()) {
Class seiClass = null;
if (DescriptionUtils.isEmpty(seiClassName)) {
// This is the client code path; the @WebServce will not have an endpointInterface member
@@ -1211,7 +1155,7 @@
annotation_WsdlLocation = getAnnoWebService().wsdlLocation();
//If this is not an implicit SEI, then make sure that its not on the SEI
- if (composite.isServiceProvider() && !composite.isDeprecatedServiceProviderConstruction()) {
+ if (composite.isServiceProvider()) {
if (!DescriptionUtils.isEmpty(getAnnoWebServiceEndpointInterface())) {
DescriptionBuilderComposite seic =
@@ -1469,7 +1413,7 @@
String className = composite.getClassName();
// REVIEW: This is using the classloader for EndpointDescriptionImpl; is that OK?
- ClassLoader classLoader = (composite.isServiceProvider() && !composite.isDeprecatedServiceProviderConstruction()) ?
+ ClassLoader classLoader = (composite.isServiceProvider()) ?
composite.getClassLoader() :
(ClassLoader) AccessController.doPrivileged(
new PrivilegedAction() {
@@ -1504,7 +1448,7 @@
public HandlerChain getAnnoHandlerChainAnnotation() {
if (this.handlerChainAnnotation == null) {
- if (composite.isServiceProvider() && !composite.isDeprecatedServiceProviderConstruction()) {
+ if (composite.isServiceProvider()) {
/*
* Per JSR-181 The @HandlerChain annotation MAY be present on
* the endpoint interface and service implementation bean. The
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java?rev=650327&r1=650326&r2=650327&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java Mon Apr 21 17:13:06 2008
@@ -242,34 +242,6 @@
}
return theUrl;
}
-
-
-
- /**
- * Create a service-provider side ServiceDesciption. Create a service Description
- * based on a service implementation class. Note this is for test-only code; it should not be
- * used in production code. And it is being removed from the test code as well.
- *
- * @deprecated
- * @param serviceImplClass
- */
- ServiceDescriptionImpl(Class serviceImplClass, AxisService axisService) {
- if (log.isDebugEnabled()) {
- log.debug("ServiceDescriptionImpl(Class,AxisService)");
- }
- composite = new DescriptionBuilderComposite();
- composite.setIsDeprecatedServiceProviderConstruction(true);
- composite.setIsServiceProvider(true);
- isServerSide = true;
-
- // Create the EndpointDescription hierachy from the service impl annotations; Since the PortQName is null,
- // it will be set to the annotation value.
- EndpointDescriptionImpl endpointDescription =
- new EndpointDescriptionImpl(serviceImplClass, null, axisService, this);
- addEndpointDescription(endpointDescription);
-
- // TODO: The ServiceQName instance variable should be set based on annotation or default
- }
ServiceDescriptionImpl(
HashMap<String, DescriptionBuilderComposite> dbcMap,
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org