[jboss-cvs] JBossAS SVN: r74835 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/client and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2008-06-19 10:21:14 -0400 (Thu, 19 Jun 2008)
New Revision: 74835

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/AbstractWebServiceRefProcessor.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
Log:
[JBMETA-44] revert changes (from rev. 74508): use @WebServiceRef.type() value for service-interface if @WebServiceRef.value() is not provided (to be re-viewed) and tests

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/AbstractWebServiceRefProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/AbstractWebServiceRefProcessor.java	2008-06-19 13:58:51 UTC (rev 74834)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/AbstractWebServiceRefProcessor.java	2008-06-19 14:21:14 UTC (rev 74835)
@@ -116,8 +116,6 @@
          ref.setServiceRefType(getType(element));
       if(annotation.value() != Object.class)
          ref.setServiceInterface(annotation.value().getName());
-      else
-         ref.setServiceInterface(ref.getServiceRefType());
       
       String injectionName = getInjectionName(element);
       Set<ResourceInjectionTargetMetaData> injectionTargets = ProcessorUtils.getInjectionTargets(injectionName, element);

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java	2008-06-19 13:58:51 UTC (rev 74834)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java	2008-06-19 14:21:14 UTC (rev 74835)
@@ -195,7 +195,7 @@
       ResourceInjectionTargetMetaData wsRefFieldTarget = wsRefTargets.iterator().next();
       assertEquals(Client.class.getName(), wsRefFieldTarget.getInjectionTargetClass());
       assertEquals("service", wsRefFieldTarget.getInjectionTargetName());
-      assertEquals(wsRefField.getType().getName(), wsRef.getServiceInterface());
+      assertNull(wsRef.getServiceInterface());
    }
 
    @ScanPackage("org.jboss.test.metadata.annotation.client.basic")

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java	2008-06-19 13:58:51 UTC (rev 74834)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java	2008-06-19 14:21:14 UTC (rev 74835)
@@ -178,7 +178,7 @@
       assertNotNull(serviceRef3);
       assertEquals(MyServlet.class.getDeclaredField("service"), serviceRef3.getAnnotatedElement());
       
-      assertEquals(TestEndpointService.class.getName(), serviceRef3.getServiceInterface());
+      assertNull(serviceRef3.getServiceInterface());
       assertEquals(TestEndpointService.class.getName(), serviceRef3.getServiceRefType());
       //InjectionTarget on a FIELD
       Set<ResourceInjectionTargetMetaData> injectionTargets3 = serviceRef3.getInjectionTargets();
@@ -192,7 +192,7 @@
       ServiceReferenceMetaData serviceRef4 = serviceRefs.get("endpoint");
       assertNotNull(serviceRef4);
       assertEquals(MyServlet.class.getDeclaredField("endpoint"), serviceRef4.getAnnotatedElement());
-      assertEquals(TestEndpoint.class.getName(), serviceRef4.getServiceInterface());
+      assertNull(serviceRef4.getServiceInterface());
       assertEquals(TestEndpoint.class.getName(), serviceRef4.getServiceRefType());
       //InjectionTarget on a FIELD
       Set<ResourceInjectionTargetMetaData> injectionTargets4 = serviceRef4.getInjectionTargets();
@@ -205,7 +205,7 @@
       
       ServiceReferenceMetaData serviceRef5 = serviceRefs.get("anotherWebRef");
       assertNotNull(serviceRef5);
-      assertEquals(TestEndpoint.class.getName(), serviceRef5.getServiceInterface());
+      assertNull(serviceRef5.getServiceInterface());
       assertEquals(TestEndpoint.class.getName(), serviceRef5.getServiceRefType());
       //InjectionTarget on a METHOD
       Set<ResourceInjectionTargetMetaData> injectionTargets5 = serviceRef5.getInjectionTargets();