Author: alessio.soldano(a)jboss.com Date: 2009-07-02 11:16:43 -0400 (Thu, 02 Jul 2009) New Revision: 10294 Removed: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RemotingRMUnMarshaller.java Modified: stack/native/branches/netty/modules/client/pom.xml stack/native/branches/netty/modules/core/pom.xml stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java stack/native/branches/netty/pom.xml Log: Removing remoting dependency Modified: stack/native/branches/netty/modules/client/pom.xml =================================================================== --- stack/native/branches/netty/modules/client/pom.xml 2009-07-02 14:38:33 UTC (rev 10293) +++ stack/native/branches/netty/modules/client/pom.xml 2009-07-02 15:16:43 UTC (rev 10294) @@ -49,7 +49,7 @@ <configuration> <archive> <manifestEntries> - <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-remoting.jar jboss-xml-binding.jar netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path> + <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-xml-binding.jar netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path> </manifestEntries> </archive> </configuration> Modified: stack/native/branches/netty/modules/core/pom.xml =================================================================== --- stack/native/branches/netty/modules/core/pom.xml 2009-07-02 14:38:33 UTC (rev 10293) +++ stack/native/branches/netty/modules/core/pom.xml 2009-07-02 15:16:43 UTC (rev 10294) @@ -145,10 +145,6 @@ <artifactId>jboss-jaxb-intros</artifactId> </dependency> <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - </dependency> - <dependency> <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </dependency> Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2009-07-02 14:38:33 UTC (rev 10293) +++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2009-07-02 15:16:43 UTC (rev 10294) @@ -49,11 +49,11 @@ import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.soap.SOAPFaultException; -import org.jboss.remoting.transport.http.HTTPMetadataConstants; import org.jboss.util.NotImplementedException; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonClient; import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.client.NettyClient; import org.jboss.ws.core.jaxws.binding.BindingExt; import org.jboss.ws.core.jaxws.binding.BindingProviderImpl; import org.jboss.ws.core.jaxws.handler.HandlerChainExecutor; @@ -216,7 +216,7 @@ Map<?, ?> remotingMetadata = (Map)msgContext.get(CommonMessageContext.REMOTING_METADATA); // Get the HTTP_RESPONSE_CODE - Integer resposeCode = (Integer)remotingMetadata.get(HTTPMetadataConstants.RESPONSE_CODE); + Integer resposeCode = (Integer)remotingMetadata.get(NettyClient.RESPONSE_CODE); if (resposeCode != null) msgContext.put(MessageContextJAXWS.HTTP_RESPONSE_CODE, resposeCode); Deleted: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RemotingRMUnMarshaller.java =================================================================== --- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RemotingRMUnMarshaller.java 2009-07-02 14:38:33 UTC (rev 10293) +++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RemotingRMUnMarshaller.java 2009-07-02 15:16:43 UTC (rev 10294) @@ -1,74 +0,0 @@ -/* - * 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.ws.extensions.wsrm.transport; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; - -import org.jboss.remoting.marshal.UnMarshaller; - - -/** - * Unmarshalls byte array from the input stream - * - * @author richard.opalka(a)jboss.com - */ -public final class RemotingRMUnMarshaller implements UnMarshaller -{ - private static final UnMarshaller instance = new RemotingRMUnMarshaller(); - - public UnMarshaller cloneUnMarshaller() throws CloneNotSupportedException - { - return getInstance(); - } - - public static UnMarshaller getInstance() - { - return instance; - } - - public Object read(InputStream is, Map metadata) throws IOException - { - if (is == null) - return RMMessageFactory.newMessage(null, new RMMetadata(metadata)); // TODO: investigate why is == null (WSAddressing reply-to test) - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - byte[] buffer = new byte[1024]; - int count = -1; - count = is.read(buffer); - while (count != -1) - { - baos.write(buffer, 0, count); - count = is.read(buffer); - } - return RMMessageFactory.newMessage(baos.toByteArray(), new RMMetadata(metadata)); - } - - public void setClassLoader(ClassLoader classloader) - { - // TODO Auto-generated method stub - - } - -} Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java =================================================================== --- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java 2009-07-02 14:38:33 UTC (rev 10293) +++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java 2009-07-02 15:16:43 UTC (rev 10294) @@ -98,7 +98,6 @@ Channel c = bootstrap.bind(new InetSocketAddress(this.port)); channelGroup.add(c); LOG.debug("WS-RM Backports Server started on port: " + this.port); - System.out.println("WS-RM Backports Server started on port: " + this.port); } catch (Exception e) { Modified: stack/native/branches/netty/pom.xml =================================================================== --- stack/native/branches/netty/pom.xml 2009-07-02 14:38:33 UTC (rev 10293) +++ stack/native/branches/netty/pom.xml 2009-07-02 15:16:43 UTC (rev 10294) @@ -68,7 +68,6 @@ <jboss.common.version>1.2.1.GA</jboss.common.version> <jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version> <jboss.logging.version>2.0.5.GA</jboss.logging.version> - <jboss.remoting.version>2.5.0.SP2</jboss.remoting.version> <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version> <apache.scout.version>0.7rc2</apache.scout.version> <juddi.version>0.9RC4</juddi.version> @@ -216,11 +215,6 @@ <artifactId>jboss-common</artifactId> <version>${jboss.common.version}</version> </dependency> - <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - <version>${jboss.remoting.version}</version> - </dependency> <!-- transitive dependencies --> <dependency> <groupId>commons-logging</groupId>