[jbossws-commits] JBossWS SVN: r10110 - in stack/native/trunk/modules/jaxws-ext: src/main/java and 5 other directories.

Author: alessio.soldano(a)jboss.com Date: 2009-05-25 14:11:59 -0400 (Mon, 25 May 2009) New Revision: 10110 Added: stack/native/trunk/modules/jaxws-ext/src/main/java/org/ stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/ stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/ stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/ stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/ stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAP.java stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPBuilder.java stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPConstants.java stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPEndpoint.java stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPRelatesTo.java Modified: stack/native/trunk/modules/jaxws-ext/pom.xml Log: [JBWS-2106] First cut of common addressing api impl Modified: stack/native/trunk/modules/jaxws-ext/pom.xml =================================================================== --- stack/native/trunk/modules/jaxws-ext/pom.xml 2009-05-25 18:09:46 UTC (rev 10109) +++ stack/native/trunk/modules/jaxws-ext/pom.xml 2009-05-25 18:11:59 UTC (rev 10110) @@ -16,6 +16,10 @@ <!-- Dependencies --> <dependencies> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + </dependency> + <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-jaxws</artifactId> <version>${version}</version> Added: stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAP.java =================================================================== --- stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAP.java (rev 0) +++ stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAP.java 2009-05-25 18:11:59 UTC (rev 10110) @@ -0,0 +1,300 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.addressing; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.xml.ws.addressing.AddressingBuilder; +import javax.xml.ws.addressing.AddressingProperties; +import javax.xml.ws.addressing.AttributedURI; +import javax.xml.ws.addressing.EndpointReference; +import javax.xml.ws.addressing.Relationship; + +import org.jboss.wsf.spi.addressing.MAP; +import org.jboss.wsf.spi.addressing.MAPBuilder; +import org.jboss.wsf.spi.addressing.MAPEndpoint; +import org.jboss.wsf.spi.addressing.MAPRelatesTo; +import org.w3c.dom.Element; + +/** + * + * @author Andrew Dinn - adinn(a)redhat.com + * @alessio.soldano(a)jboss.com + * @since 25-May-2009 + * + */ +public class NativeMAP implements MAP +{ + /** + * the wrapped instance which this class delegates to + */ + private AddressingProperties implementation; + + /** + * JBossWS Native specific constructor + * @param implementation + */ + NativeMAP(AddressingProperties implementation) + { + this.implementation = implementation; + } + + public String getTo() + { + AttributedURI to = implementation.getTo(); + return (to != null ? to.getURI().toString() : null); + } + + public MAPEndpoint getFrom() + { + EndpointReference from = implementation.getFrom(); + return (from != null ? new NativeMAPEndpoint(from) : null); + } + + public String getMessageID() + { + AttributedURI messageId = implementation.getMessageID(); + return (messageId != null ? messageId.getURI().toString() : null); + } + + public String getAction() + { + AttributedURI action = implementation.getAction(); + return (action != null ? action.getURI().toString() : null); + } + + public MAPEndpoint getFaultTo() + { + EndpointReference faultTo = implementation.getFaultTo(); + return (faultTo != null ? new NativeMAPEndpoint(faultTo) : null); + } + + public MAPEndpoint getReplyTo() + { + EndpointReference replyTo = implementation.getReplyTo(); + return (replyTo != null ? new NativeMAPEndpoint(replyTo) : null); + } + + public MAPRelatesTo getRelatesTo() + { + MAPBuilder builder = NativeMAPBuilder.getBuilder(); + Relationship[] relationship = implementation.getRelatesTo(); + if (relationship != null) + { + Relationship relatesTo = relationship[0]; + return builder.newRelatesTo(relatesTo.getID().toString(), relatesTo.getType()); + } + else + { + return null; + } + } + + public void setTo(String address) + { + if (address != null) + { + try + { + AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); + AttributedURI uri = builder.newURI(address); + implementation.setTo(uri); + } + catch (URISyntaxException e) + { + // should not happen + } + } + else + { + implementation.setTo(null); + } + } + + public void setFrom(MAPEndpoint epref) + { + if (epref != null) + { + if (epref instanceof NativeMAPEndpoint) + { + implementation.setFrom(((NativeMAPEndpoint)epref).getImplementation()); + } + else + { + throw new IllegalArgumentException("Unsupported MAPEndpoint: " + epref); + } + } + else + { + implementation.setFrom(null); + } + } + + public void setMessageID(String messageID) + { + if (messageID != null) + { + try + { + AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); + AttributedURI uri = builder.newURI(messageID); + implementation.setMessageID(uri); + } + catch (URISyntaxException e) + { + // should not happen + } + } + else + { + implementation.setMessageID(null); + } + } + + public void setAction(String action) + { + if (action != null) + { + try + { + AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); + AttributedURI uri = builder.newURI(action); + implementation.setAction(uri); + } + catch (URISyntaxException e) + { + // should not happen + } + } + else + { + implementation.setAction(null); + } + } + + public void setReplyTo(MAPEndpoint epref) + { + if (epref != null) + { + if (epref instanceof NativeMAPEndpoint) + { + implementation.setReplyTo(((NativeMAPEndpoint)epref).getImplementation()); + } + else + { + throw new IllegalArgumentException("Unsupported MAPEndpoint: " + epref); + } + } + else + { + implementation.setReplyTo(null); + } + } + + public void setFaultTo(MAPEndpoint epref) + { + if (epref != null) + { + if (epref instanceof NativeMAPEndpoint) + { + implementation.setFaultTo(((NativeMAPEndpoint)epref).getImplementation()); + } + else + { + throw new IllegalArgumentException("Unsupported MAPEndpoint: " + epref); + } + } + else + { + implementation.setFaultTo(null); + } + } + + public void setRelatesTo(MAPRelatesTo relatesTo) + { + if (relatesTo != null) + { + try + { + AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); + Relationship[] relationships = new Relationship[1]; + String relatesToId = relatesTo.getRelatesTo(); + URI uri = new URI(relatesToId); + Relationship relationship = builder.newRelationship(uri); + relationship.setType(relatesTo.getType()); + relationships[0] = relationship; + implementation.setRelatesTo(relationships); + } + catch (URISyntaxException e) + { + // should not happen + } + } + else + { + implementation.setRelatesTo(null); + } + } + + public void addReferenceParameter(Element refParam) + { + implementation.getReferenceParameters().addElement(refParam); + } + + public List<Element> getReferenceParameters() + { + List<Element> list = new LinkedList<Element>(); + for (Object obj : implementation.getReferenceParameters().getElements()) + { + list.add((Element)obj); + } + return list; + } + + public void initializeAsDestination(MAPEndpoint epref) + { + if (epref instanceof NativeMAPEndpoint) + { + implementation.initializeAsDestination(((NativeMAPEndpoint)epref).getImplementation()); + } + else + { + throw new IllegalArgumentException("Unsupported MAPEndpoint: " + epref); + } + } + + public void installOutboundMap(Map<String, Object> requestContext, MAP map) + { + if (!(map instanceof NativeMAP)) + { + throw new IllegalArgumentException("Unsupported MAP: " + map); + } + AddressingProperties addressingProperties = ((NativeMAP)map).implementation; + + requestContext.put(NativeMAPConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties); + requestContext.put(NativeMAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties); + } +} Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAP.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPBuilder.java =================================================================== --- stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPBuilder.java (rev 0) +++ stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPBuilder.java 2009-05-25 18:11:59 UTC (rev 10110) @@ -0,0 +1,124 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.addressing; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.addressing.AddressingBuilder; +import javax.xml.ws.addressing.AddressingConstants; +import javax.xml.ws.addressing.AddressingProperties; +import javax.xml.ws.addressing.EndpointReference; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.wsf.spi.addressing.MAP; +import org.jboss.wsf.spi.addressing.MAPBuilder; +import org.jboss.wsf.spi.addressing.MAPConstants; +import org.jboss.wsf.spi.addressing.MAPEndpoint; +import org.jboss.wsf.spi.addressing.MAPRelatesTo; + +/** + * + * @author Andrew Dinn - adinn(a)redhat.com + * @author alessio.soldano(a)jboss.com + * @since 25-May-2009 + * + */ +public class NativeMAPBuilder implements MAPBuilder +{ + private AddressingBuilder addressingBuilder; + + private static MAPBuilder theBuilder = new NativeMAPBuilder(); + + public static MAPBuilder getBuilder() + { + return theBuilder; + } + + public MAP newMap() + { + AddressingProperties implementation = addressingBuilder.newAddressingProperties(); + return new NativeMAP(implementation); + } + + /** + * retrieve the inbound server message address properties attached to a message context + * @param ctx the server message context + * @return + */ + public MAP inboundMap(MessageContext ctx) + { + AddressingProperties implementation = (AddressingProperties)ctx.get(NativeMAPConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND); + return newMap(implementation); + } + + /** + * retrieve the outbound client message address properties attached to a message request map + * @param ctx the client request properties map + * @return + */ + public MAP outboundMap(Map<String, Object> ctx) + { + AddressingProperties implementation = (AddressingProperties)ctx.get(NativeMAPConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); + return newMap(implementation); + } + + // n.b. this is package public only! + MAP newMap(AddressingProperties implementation) + { + return new NativeMAP(implementation); + } + + public MAPConstants newConstants() + { + AddressingConstants implementation = addressingBuilder.newAddressingConstants(); + return new NativeMAPConstants(implementation); + } + + public MAPEndpoint newEndpoint(String address) + { + try + { + URI uri = new URI(address); + EndpointReference implementation = addressingBuilder.newEndpointReference(uri); + return new NativeMAPEndpoint(implementation); + } + catch (URISyntaxException e) + { + return null; + } + } + + public MAPRelatesTo newRelatesTo(String id, QName type) + { + return new NativeMAPRelatesTo(id, type); + } + + private NativeMAPBuilder() + { + AddressingBuilder implementation = AddressingBuilder.getAddressingBuilder(); + this.addressingBuilder = implementation; + } + +} Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPConstants.java =================================================================== --- stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPConstants.java (rev 0) +++ stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPConstants.java 2009-05-25 18:11:59 UTC (rev 10110) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.addressing; + +import javax.xml.ws.addressing.AddressingConstants; +import javax.xml.ws.addressing.JAXWSAConstants; + +import org.jboss.wsf.spi.addressing.MAPConstants; + +public class NativeMAPConstants implements MAPConstants +{ + private AddressingConstants implementation; + + public static final String CLIENT_ADDRESSING_PROPERTIES = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES; + public static final String CLIENT_ADDRESSING_PROPERTIES_INBOUND = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND; + public static final String CLIENT_ADDRESSING_PROPERTIES_OUTBOUND = JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND; + public static final String SERVER_ADDRESSING_PROPERTIES_INBOUND = JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND; + public static final String SERVER_ADDRESSING_PROPERTIES_OUTBOUND = JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND; + + + NativeMAPConstants(AddressingConstants implementation) + { + this.implementation = implementation; + } + + public String getClientAddressingProperties() + { + return CLIENT_ADDRESSING_PROPERTIES; + } + + public String getClientAddressingPropertiesInbound() + { + return CLIENT_ADDRESSING_PROPERTIES_INBOUND; + } + + public String getClientAddressingPropertiesOutbound() + { + return CLIENT_ADDRESSING_PROPERTIES_OUTBOUND; + } + + public String getNoneURI() + { + return implementation.getNoneURI(); + } + + public String getAnonymousURI() + { + return implementation.getAnonymousURI(); + } + + public String getServerAddressingPropertiesInbound() + { + return SERVER_ADDRESSING_PROPERTIES_INBOUND; + } + + public String getServerAddressingPropertiesOutbound() + { + return SERVER_ADDRESSING_PROPERTIES_OUTBOUND; + } + +} Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPConstants.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPEndpoint.java =================================================================== --- stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPEndpoint.java (rev 0) +++ stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPEndpoint.java 2009-05-25 18:11:59 UTC (rev 10110) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.addressing; + +import javax.xml.ws.addressing.EndpointReference; + +import org.jboss.wsf.spi.addressing.MAPEndpoint; +import org.w3c.dom.Element; + +/** + * + * @author Andrew Dinn - adinn(a)redhat.com + * @author alessio.soldano(a)jboss.com + * @since 25-May-2009 + * + */ +public class NativeMAPEndpoint implements MAPEndpoint +{ + private EndpointReference implementation; + + NativeMAPEndpoint(EndpointReference implementation) + { + this.implementation = implementation; + } + + public String getAddress() + { + return implementation.getAddress().getURI().toString(); + } + + public void addReferenceParameter(Element element) + { + implementation.getReferenceParameters().addElement(element); + } + + EndpointReference getImplementation() + { + return implementation; + } + +} Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPRelatesTo.java =================================================================== --- stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPRelatesTo.java (rev 0) +++ stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPRelatesTo.java 2009-05-25 18:11:59 UTC (rev 10110) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.addressing; + +import javax.xml.namespace.QName; + +import org.jboss.wsf.spi.addressing.MAPRelatesTo; + +/** + * + * @author Andrew Dinn - adinn(a)redhat.com + * @author alessio.soldano(a)jboss.com + * @since 25-May-2009 + * + */ +public class NativeMAPRelatesTo implements MAPRelatesTo +{ + private String relatesTo; + private QName type; + + NativeMAPRelatesTo(String relatesTo, QName type) + { + this.relatesTo = relatesTo; + this.type = type; + } + + public String getRelatesTo() + { + return relatesTo; + } + + public QName getType() + { + return type; + } + + public void setType(QName type) + { + this.type = type; + } +} Property changes on: stack/native/trunk/modules/jaxws-ext/src/main/java/org/jboss/wsf/stack/addressing/NativeMAPRelatesTo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF