[jboss-cvs] JBossAS SVN: r74966 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/client and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 24 05:52:21 EDT 2008
Author: emuckenhuber
Date: 2008-06-24 05:52:21 -0400 (Tue, 24 Jun 2008)
New Revision: 74966
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefClassProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefFieldProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefMethodProcessor.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/HandlerChainsTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/handlerchains/AnnotatedClient.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/handlerchains/AnnotatedClientExternal.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
Log:
[JBMETA-64] use declaringClass / name as serviceRefName
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefClassProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefClassProcessor.java 2008-06-24 09:40:42 UTC (rev 74965)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefClassProcessor.java 2008-06-24 09:52:21 UTC (rev 74966)
@@ -44,8 +44,7 @@
@Override
protected String getName(Class<?> element)
{
- String name = element.getSimpleName();
- return name;
+ throw new IllegalStateException("@WebServiceRef annotation on type '"+ element.getName() +"' must define a name.");
}
@Override
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefFieldProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefFieldProcessor.java 2008-06-24 09:40:42 UTC (rev 74965)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefFieldProcessor.java 2008-06-24 09:52:21 UTC (rev 74966)
@@ -49,7 +49,8 @@
protected String getName(Field element)
{
String name = element.getName();
- return name;
+ // declaringClass / name
+ return element.getDeclaringClass().getName() + "/" + name;
}
@Override
protected String getInjectionName(Field element)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefMethodProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefMethodProcessor.java 2008-06-24 09:40:42 UTC (rev 74965)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceRefMethodProcessor.java 2008-06-24 09:52:21 UTC (rev 74966)
@@ -54,7 +54,8 @@
{
name = name.toLowerCase();
}
- return name;
+ // declaringClass / name
+ return element.getDeclaringClass().getName() + "/" + name;
}
@Override
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/HandlerChainsTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/HandlerChainsTestCase.java 2008-06-24 09:40:42 UTC (rev 74965)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/HandlerChainsTestCase.java 2008-06-24 09:52:21 UTC (rev 74966)
@@ -83,7 +83,7 @@
assertNotNull(serviceRefs);
assertEquals(4, serviceRefs.size());
- ServiceReferenceMetaData serviceRef = serviceRefs.get("endpoint");
+ ServiceReferenceMetaData serviceRef = serviceRefs.get(AnnotatedClient.class.getName() +"/endpoint");
assertNotNull(serviceRef);
ServiceReferenceHandlerChainsMetaData handlerChains = serviceRef.getHandlerChains();
assertNotNull(handlerChains);
@@ -94,7 +94,7 @@
assertEquals(" SOAP11ServerHandler ", serviceHandlerChain.getHandler().get(0).getHandlerName());
assertEquals(" org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler ", serviceHandlerChain.getHandler().get(0).getHandlerClass());
- ServiceReferenceMetaData endpoint2 = serviceRefs.get("endpoint2");
+ ServiceReferenceMetaData endpoint2 = serviceRefs.get(AnnotatedClient.class.getName() + "/endpoint2");
assertNotNull(endpoint2);
assertNotNull(endpoint2.getHandlerChains());
assertNotNull(endpoint2.getHandlerChains().getHandlers());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/handlerchains/AnnotatedClient.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/handlerchains/AnnotatedClient.java 2008-06-24 09:40:42 UTC (rev 74965)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/handlerchains/AnnotatedClient.java 2008-06-24 09:52:21 UTC (rev 74966)
@@ -30,7 +30,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
- at WebServiceRef
+ at WebServiceRef(name = "service")
@HandlerChain(file = "handler-chains.xml")
public class AnnotatedClient
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/handlerchains/AnnotatedClientExternal.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/handlerchains/AnnotatedClientExternal.java 2008-06-24 09:40:42 UTC (rev 74965)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/handlerchains/AnnotatedClientExternal.java 2008-06-24 09:52:21 UTC (rev 74966)
@@ -28,7 +28,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
- at WebServiceRef
+ at WebServiceRef(name = "service")
@HandlerChain(file = "http://point.to.nowhere:6666/handler-chains.xml")
public class AnnotatedClientExternal
{
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-24 09:40:42 UTC (rev 74965)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java 2008-06-24 09:52:21 UTC (rev 74966)
@@ -174,7 +174,7 @@
assertEquals(TestEndpoint.class.getName(), serviceRef2.getServiceRefType());
assertNull(serviceRef2.getInjectionTargets());
- ServiceReferenceMetaData serviceRef3 = serviceRefs.get("service");
+ ServiceReferenceMetaData serviceRef3 = serviceRefs.get("org.jboss.test.metadata.annotation.web.MyServlet/service");
assertNotNull(serviceRef3);
assertEquals(MyServlet.class.getDeclaredField("service"), serviceRef3.getAnnotatedElement());
@@ -189,7 +189,7 @@
injectionTarget.setInjectionTargetName("service");
assertTrue(injectionTargets3.contains(injectionTarget));
- ServiceReferenceMetaData serviceRef4 = serviceRefs.get("endpoint");
+ ServiceReferenceMetaData serviceRef4 = serviceRefs.get(MyServlet.class.getName() + "/endpoint");
assertNotNull(serviceRef4);
assertEquals(MyServlet.class.getDeclaredField("endpoint"), serviceRef4.getAnnotatedElement());
assertNull(serviceRef4.getServiceInterface());
@@ -203,7 +203,7 @@
injectionTarget.setInjectionTargetName("endpoint");
assertTrue(injectionTargets4.contains(injectionTarget));
- ServiceReferenceMetaData serviceRef5 = serviceRefs.get("anotherWebRef");
+ ServiceReferenceMetaData serviceRef5 = serviceRefs.get(MyServlet.class.getName() + "/anotherWebRef");
assertNotNull(serviceRef5);
assertNull(serviceRef5.getServiceInterface());
assertEquals(TestEndpoint.class.getName(), serviceRef5.getServiceRefType());
More information about the jboss-cvs-commits
mailing list