axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From barre...@apache.org
Subject svn commit: r646587 - in /webservices/axis2/branches/java/1_4/modules: jaxws/src/org/apache/axis2/jaxws/server/ metadata/src/org/apache/axis2/jaxws/description/ metadata/src/org/apache/axis2/jaxws/description/impl/ metadata/test/org/apache/axis2/jaxws/...
Date Wed, 09 Apr 2008 23:14:51 GMT
Author: barrettj
Date: Wed Apr  9 16:14:50 2008
New Revision: 646587

URL: http://svn.apache.org/viewvc?rev=646587&view=rev
Log:
Remove deprecated factory method for creating a service description from an existing Axis
Service and service impl class.  This is no longer needed now that JAXWS annotated endpoints
can be deployed in Axis2.

Modified:
    webservices/axis2/branches/java/1_4/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
    webservices/axis2/branches/java/1_4/modules/metadata/src/org/apache/axis2/jaxws/description/DescriptionFactory.java
    webservices/axis2/branches/java/1_4/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
    webservices/axis2/branches/java/1_4/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java
    webservices/axis2/branches/java/1_4/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportTests.java

Modified: webservices/axis2/branches/java/1_4/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?rev=646587&r1=646586&r2=646587&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_4/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
(original)
+++ webservices/axis2/branches/java/1_4/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
Wed Apr  9 16:14:50 2008
@@ -92,19 +92,7 @@
         Parameter endpointDescParam =
                 service.getParameter(EndpointDescription.AXIS_SERVICE_PARAMETER);
         if (endpointDescParam == null) {
-            ClassLoader serviceClassLoader = service.getClassLoader();
-            String serviceClass = (String) svcClassParam.getValue();
-            try {
-                Class clazz = Class.forName(serviceClass, true, service.getClassLoader());
-                ServiceDescription serviceDesc =
-                        DescriptionFactory.createServiceDescriptionFromServiceImpl(
-                                clazz, service);
-                service.addParameter(new Parameter(org.apache.axis2.jaxws.spi.Constants.CACHE_CLASSLOADER,

-                        service.getClassLoader()));
-            } catch (ClassNotFoundException e) {
-                throw new RuntimeException(
-                        Messages.getMessage("JAXWSMessageReceiverNoServiceClass"));
-            }
+            throw new RuntimeException(Messages.getMessage("JAXWSMessageReceiverNoServiceClass"));
         }
         AxisOperation operation = axisRequestMsgCtx.getAxisOperation();
         String mep = operation.getMessageExchangePattern();

Modified: webservices/axis2/branches/java/1_4/modules/metadata/src/org/apache/axis2/jaxws/description/DescriptionFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/metadata/src/org/apache/axis2/jaxws/description/DescriptionFactory.java?rev=646587&r1=646586&r2=646587&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_4/modules/metadata/src/org/apache/axis2/jaxws/description/DescriptionFactory.java
(original)
+++ webservices/axis2/branches/java/1_4/modules/metadata/src/org/apache/axis2/jaxws/description/DescriptionFactory.java
Wed Apr  9 16:14:50 2008
@@ -368,24 +368,6 @@
     }
 
     /**
-     * DO NOT USE THIS METHOD FOR PRODUCTION CODE.  It has been deprecated and is only used
to drive
-     * some testing.  Note that the AxisService and associated Axis description objects ARE
NOT
-     * created or updated by this factory method.
-     *
-     * @param serviceImplClass A service implementation class with annotations
-     * @param axisService      A FULLY POPULATED AxisService including all of the underlying
-     *                         description objects such as AxisOperations.
-     * @return A ServiceDescription hierarchy constructed (via Java reflection) from the
service
-     *         implementation class and tied via properties to the existing AxisService object.
-     * @deprecated Use {@link #createServiceDescriptionFromDBCMap(HashMap)}
-     */
-    public static ServiceDescription createServiceDescriptionFromServiceImpl(Class serviceImplClass,
-                                                                             AxisService
axisService) {
-        return DescriptionFactoryImpl
-                .createServiceDescriptionFromServiceImpl(serviceImplClass, axisService);
-    }
-
-    /**
      * Creates Client ConfigurationFactory used to create AxisConfiguration.
      *
      * @return A Client Configuration Factory's new instance. ClinetConfigurationFactory
is

Modified: webservices/axis2/branches/java/1_4/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java?rev=646587&r1=646586&r2=646587&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_4/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
(original)
+++ webservices/axis2/branches/java/1_4/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
Wed Apr  9 16:14:50 2008
@@ -195,22 +195,6 @@
         }
     }    
     
-    /**
-     * @see org.apache.axis2.jaxws.description.DescriptionFactory#createServiceDescriptionFromServiceImpl(Class,
-     *      AxisService)
-     * @deprecated
-     */
-    public static ServiceDescription createServiceDescriptionFromServiceImpl(
-            Class serviceImplClass, AxisService axisService) {
-        ServiceDescription serviceDesc = new ServiceDescriptionImpl(serviceImplClass, axisService);
-        if (log.isDebugEnabled()) {
-            log.debug("Deprecated method used!  ServiceDescription created with Class: "
+
-                    serviceImplClass + "; AxisService: " + axisService);
-            log.debug(serviceDesc.toString());
-        }
-        return serviceDesc;
-    }
-
     /** @see org.apache.axis2.jaxws.description.DescriptionFactory#createServiceDescription(Class)
*/
     public static ServiceDescription createServiceDescription(Class serviceImplClass) {
         return createServiceDescription(serviceImplClass, null);

Modified: webservices/axis2/branches/java/1_4/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java?rev=646587&r1=646586&r2=646587&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_4/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java
(original)
+++ webservices/axis2/branches/java/1_4/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java
Wed Apr  9 16:14:50 2008
@@ -108,28 +108,6 @@
 
     }
 
-    public void testAxisServiceBackpointer() {
-        // Test that the AxisService points back to the EndpointDesc
-        // TODO: Temporary: Create an AxisService to pass in using WSDL
-        // TODO: Eventually remove AxisService paramater from the factory; AxisService should
be created (using annotations/wsdl/wsm etc)
-
-        // Creating the AxisService this way is temporary; it should be created as part of
creating the EndpointDescription from the
-        // Service Impl.  For now, though, create a service-request-based ServiceDesc using
WSDL.  Then specificy that AxisService
-        // on the creation of the ServiceDesc from the service impl.  Verify that the AxisService
points to the ServiceDesc.
-
-        AxisService axisService = new AxisService();
-        ServiceDescription serviceDesc =
-                DescriptionFactory.createServiceDescriptionFromServiceImpl(
-                        EchoServiceImplWithSEI.class, axisService);
-        EndpointDescription endpointDesc = serviceDesc.getEndpointDescriptions()[0];
-        assertNotNull(serviceDesc);
-        Parameter endpointDescParam =
-                axisService.getParameter(EndpointDescription.AXIS_SERVICE_PARAMETER);
-        assertNotNull(endpointDescParam);
-        assertEquals(endpointDesc, endpointDescParam.getValue());
-
-    }
-
     public void testOverloadedServiceImplWithSEI() {
         ServiceDescription serviceDesc =
                 DescriptionFactory.createServiceDescription(DocLitWrappedImplWithSEI.class);

Modified: webservices/axis2/branches/java/1_4/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportTests.java?rev=646587&r1=646586&r2=646587&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_4/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportTests.java
(original)
+++ webservices/axis2/branches/java/1_4/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportTests.java
Wed Apr  9 16:14:50 2008
@@ -139,26 +139,6 @@
     }
     
     /**
-     * The other path through MDQ that didn't use DBCs was creating the service impl hierachy

-     * using reflection on the service impl class.  This is deprecated but it is used in
the JAXWS
-     * open source tests (for now).  So, this validates we don't break those tests.
-     * 
-     * When the deprecated logic is removed, this test can also be removed.
-     */
-    public void testDeprecatedServiceImplConstruction() {
-        AxisService axisService = new AxisService();
-        ServiceDescription svcDesc = DescriptionFactory.
-            createServiceDescriptionFromServiceImpl(ClientDBCSupportEchoServiceImplWithSEI.class,
axisService);
-        assertNotNull(svcDesc);
-        ServiceDescriptionImpl svcDescImpl = (ServiceDescriptionImpl) svcDesc;
-        DescriptionBuilderComposite svcDescComposite = svcDescImpl.getDescriptionBuilderComposite();
-        assertNotNull(svcDescComposite);
-        
-        // Since this is a server-side impl, there should be no class corresponding to the
client-side
-        // Service class.
-        assertNull(svcDescComposite.getCorrespondingClass());
-    }
-    /**
      * Test the ability to set a prefered port on a service description via  a sparse composite.
      */
     public void testPreferredPort() {



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message