[jboss-cvs] JBossAS SVN: r74900 - 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
Mon Jun 23 08:36:26 EDT 2008
Author: emuckenhuber
Date: 2008-06-23 08:36:26 -0400 (Mon, 23 Jun 2008)
New Revision: 74900
Added:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/client/handlerchains/handler-chains2.xml
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/ServiceReferenceHandlerChainsWrapper.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceHandlerChainProcessor.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
Log:
[JBMETA-65] corrected namespace class binding for handler-chains.
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/ServiceReferenceHandlerChainsWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/ServiceReferenceHandlerChainsWrapper.java 2008-06-23 09:12:47 UTC (rev 74899)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/ServiceReferenceHandlerChainsWrapper.java 2008-06-23 12:36:26 UTC (rev 74900)
@@ -39,9 +39,7 @@
*/
@XmlRootElement(name= "handler-chains", namespace = JavaEEMetaDataConstants.JAVAEE_NS)
@JBossXmlSchema(
- xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "javaee"),
- @XmlNs(namespaceURI = "http://org.jboss.ws/jaxws/handlerscope", prefix = "ns1")
- },
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "javaee")},
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
elementFormDefault=XmlNsForm.QUALIFIED)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceHandlerChainProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceHandlerChainProcessor.java 2008-06-23 09:12:47 UTC (rev 74899)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceHandlerChainProcessor.java 2008-06-23 12:36:26 UTC (rev 74900)
@@ -62,7 +62,7 @@
static
{
resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("javaee_web_services_1_2.xsd", ServiceReferenceHandlerChainsWrapper.class);
+ resolver.addClassBinding("http://java.sun.com/xml/ns/javaee", ServiceReferenceHandlerChainsWrapper.class);
}
public WebServiceHandlerChainProcessor(AnnotationFinder<AnnotatedElement> finder)
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-23 09:12:47 UTC (rev 74899)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/HandlerChainsTestCase.java 2008-06-23 12:36:26 UTC (rev 74900)
@@ -23,7 +23,6 @@
import java.lang.reflect.AnnotatedElement;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import org.jboss.metadata.annotation.creator.client.ApplicationClient5MetaDataCreator;
@@ -37,7 +36,6 @@
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.test.metadata.annotation.client.handlerchains.AnnotatedClient;
import org.jboss.test.metadata.annotation.client.handlerchains.AnnotatedClientExternal;
-import org.jboss.test.metadata.common.PackageScanner;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
/**
@@ -83,7 +81,7 @@
ServiceReferencesMetaData serviceRefs = clientMD.getServiceReferences();
assertNotNull(serviceRefs);
- assertEquals(3, serviceRefs.size());
+ assertEquals(4, serviceRefs.size());
ServiceReferenceMetaData serviceRef = serviceRefs.get("endpoint");
assertNotNull(serviceRef);
@@ -95,6 +93,16 @@
assertNotNull(serviceHandlerChain);
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");
+ assertNotNull(endpoint2);
+ assertNotNull(endpoint2.getHandlerChains());
+ assertNotNull(endpoint2.getHandlerChains().getHandlers());
+ assertEquals(1, endpoint2.getHandlerChains().getHandlers().size());
+ ServiceReferenceHandlerChainMetaData endpoint2HandlerChain = endpoint2.getHandlerChains().getHandlers().get(0);
+ assertNotNull(endpoint2HandlerChain);
+ assertEquals("ClientLogicalHandler", endpoint2HandlerChain.getHandler().get(0).getHandlerName());
+ assertEquals("org.jboss.test.ws.ClientLogicalHandler", endpoint2HandlerChain.getHandler().get(0).getHandlerClass());
}
public void testHandlerChainWithExternalReference()
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-23 09:12:47 UTC (rev 74899)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/handlerchains/AnnotatedClient.java 2008-06-23 12:36:26 UTC (rev 74900)
@@ -40,6 +40,10 @@
TestEndpoint endpoint;
@WebServiceRef
+ @HandlerChain(file = "handler-chains2.xml")
+ TestEndpoint endpoint2;
+
+ @WebServiceRef
@HandlerChain(file = "handler-chains.xml")
public void setTestEndpoint(TestEndpoint endpoint)
{
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/client/handlerchains/handler-chains2.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/client/handlerchains/handler-chains2.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/client/handlerchains/handler-chains2.xml 2008-06-23 12:36:26 UTC (rev 74900)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee">
+ <!-- port based handlers -->
+ <handler-chain>
+ <handler>
+ <handler-name>ClientLogicalHandler</handler-name>
+ <handler-class>org.jboss.test.ws.ClientLogicalHandler</handler-class>
+ </handler>
+ </handler-chain>
+</handler-chains>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list