[jbossws-commits] JBossWS SVN: r15996 - in stack/native/branches/jbossws-native-4.0.x: modules/core and 17 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Mar 19 05:52:49 EDT 2012
Author: ropalka
Date: 2012-03-19 05:52:46 -0400 (Mon, 19 Mar 2012)
New Revision: 15996
Removed:
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/com/sun/xml/fastinfoset/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/fastinfoset/
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
[JBPAPP-8480] Merged revisions 15995 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r15995 | ropalka | 2012-03-19 10:34:14 +0100 (Mon, 19 Mar 2012) | 1 line
[JBWS-3465] removing FastInfoset feature
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15876,15878-15891,15904-15933,15935-15944,15974,15988,15991
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15876,15878-15891,15904-15933,15935-15944,15974,15988,15991,15995
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -118,10 +118,6 @@
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
</dependency>
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/annotation/FastInfoset.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,49 +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.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.xml.ws.spi.WebServiceFeatureAnnotation;
-
-import org.jboss.ws.feature.FastInfosetFeature;
-
-/**
- * This feature represents the use of FastInfoset
- *
- * @author Thomas.Diesler at jboss.com
- * @since 29-Feb-2008
- */
- at Retention(value = RetentionPolicy.RUNTIME)
- at Target(value = { ElementType.TYPE })
- at EndpointFeature( id = FastInfosetFeature.ID)
- at WebServiceFeatureAnnotation(id = FastInfosetFeature.ID, bean = FastInfosetFeature.class)
-public @interface FastInfoset {
-
- /**
- * Specifies if the feature is enabled or disabled
- */
- boolean enabled() default true;
-}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,62 +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.core.client;
-
-import java.util.Map;
-
-import javax.xml.soap.MimeHeaders;
-
-import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.soap.FastInfosetMarshaller;
-import org.jboss.ws.core.soap.FastInfosetUnMarshaller;
-import org.jboss.ws.core.soap.attachment.MimeConstants;
-
-/**
- * SOAPConnection implementation
- *
- * @author Thomas.Diesler at jboss.org
- * @since 12-Mar-2008
- */
-public class FastInfosetConnectionHTTP extends SOAPProtocolConnectionHTTP
-{
- public UnMarshaller getUnmarshaller()
- {
- return new FastInfosetUnMarshaller();
- }
-
- public Marshaller getMarshaller()
- {
- return new FastInfosetMarshaller();
- }
-
- @Override
- protected void populateHeaders(MessageAbstraction reqMessage, Map<String, Object> metadata)
- {
- if (reqMessage != null)
- {
- MimeHeaders mimeHeaders = reqMessage.getMimeHeaders();
- mimeHeaders.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_FASTINFOSET);
- mimeHeaders.addHeader(MimeConstants.ACCEPT, MimeConstants.TYPE_FASTINFOSET);
- }
- super.populateHeaders(reqMessage, metadata);
- }
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -25,7 +25,6 @@
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.api.util.ServiceLoader;
-import org.jboss.ws.feature.FastInfosetFeature;
/**
* A factory for remote connections
@@ -50,11 +49,6 @@
if (key == null)
throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_REMOTE_CONNETION", targetAddress));
- if (epInfo.isFeatureEnabled(FastInfosetFeature.class))
- {
- key += ".fastinfoset";
- }
-
RemoteConnection con = (RemoteConnection)ServiceLoader.loadService(key, null, this.getClass().getClassLoader());
if (con == null)
throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_REMOTE_CONNETION", key));
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -63,7 +63,6 @@
import org.jboss.ws.core.client.ssl.SSLContextFactory;
import org.jboss.ws.core.client.transport.WSResponseHandler.Result;
import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.config.EndpointProperty;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.wsf.spi.metadata.config.CommonConfig;
@@ -356,10 +355,6 @@
String sizeValue = config.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE);
if (sizeValue != null)
chunkSize = Integer.valueOf(sizeValue);
-
- //fastinfoset always disable chunking
- if (epMetaData.isFeatureEnabled(FastInfosetFeature.class))
- chunkSize = 0;
}
//override using call props
try
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -41,7 +41,6 @@
import org.jboss.ws.core.jaxws.binding.BindingExt;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
import org.jboss.ws.feature.ChunkedEncodingFeature;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
@@ -70,7 +69,6 @@
private static FeatureSet supportedFeatures = new FeatureSet();
static
{
- supportedFeatures.addFeature(new FastInfosetFeature());
supportedFeatures.addFeature(new SchemaValidationFeature());
supportedFeatures.addFeature(new AddressingFeature());
supportedFeatures.addFeature(new MTOMFeature());
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,80 +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.core.soap;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.common.Constants;
-import org.jboss.ws.core.CommonSOAPFaultException;
-import org.jboss.ws.common.DOMUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import com.sun.xml.fastinfoset.dom.DOMDocumentParser;
-
-/**
- * A SOAPEnvelope builder for FastInfoset
- *
- * @author Thomas.Diesler at jboss.com
- * @since 12-Mar-2008
- */
-public class FastInfosetEnvelopeBuilder extends EnvelopeBuilderDOM
-{
- @Override
- public SOAPEnvelope build(SOAPMessage soapMessage, InputStream ins, boolean ignoreParseError) throws IOException, SOAPException
- {
- // Parse the XML input stream
- Element domEnv = null;
- try
- {
- DOMDocumentParser parser = new DOMDocumentParser();
- Document resDoc = DOMUtils.getDocumentBuilder().newDocument();
- parser.parse(resDoc, ins);
- domEnv = resDoc.getDocumentElement();
- }
- catch (Exception ex)
- {
- if (ignoreParseError)
- {
- return null;
- }
- QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
- throw new CommonSOAPFaultException(faultCode, ex.getMessage());
- }
-
- return build(soapMessage, domEnv);
- }
-
- @Override
- public SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException
- {
- throw new NotImplementedException();
- }
-}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,77 +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.core.soap;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ResourceBundle;
-
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.ws.core.client.Marshaller;
-
-import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer;
-
-/**
- * @author Thomas.Diesler at jboss.org
- * @author alessio.soldano at jboss.com
- * @since 12-Mar-2008
- */
-public class FastInfosetMarshaller implements Marshaller
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(FastInfosetMarshaller.class);
- /**
- * Marshaller will need to take the dataObject and convert
- * into primitive java data types and write to the
- * given output.
- *
- * @param dataObject Object to be writen to output
- * @param output The data output to write the object
- * data to.
- */
- public void write(Object dataObject, OutputStream output) throws IOException
- {
- if ((dataObject instanceof SOAPMessage) == false)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NOT_A_SOAPMESSAGE", dataObject));
-
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)dataObject;
- if (soapMessage.getAttachments().hasNext())
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "ATTACHMENTS_NOT_SUPPORTED_WITH_FASTINFOSET"));
-
- try
- {
- SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
- DOMDocumentSerializer serializer = new DOMDocumentSerializer();
- serializer.setOutputStream(output);
- serializer.serialize(soapEnv);
- }
- catch (SOAPException ex)
- {
- IOException ioex = new IOException(BundleUtils.getMessage(bundle, "CANNOT_SERIALIZE_SOAP_ENVELOPE"));
- ioex.initCause(ex);
- throw ioex;
- }
- }
-}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,46 +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.core.soap;
-
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-
-/**
- * @author Thomas.Diesler at jboss.org
- * @since 12-Mar-2008
- */
-public class FastInfosetUnMarshaller extends SOAPMessageUnMarshallerHTTP
-{
- @Override
- protected MessageFactoryImpl getMessageFactory()
- {
- CommonMessageContext context = MessageContextAssociation.peekMessageContext();
- EndpointMetaData epMetaData = context != null ? context.getEndpointMetaData() : null;
-
- MessageFactoryImpl factory = super.getMessageFactory();
- if (epMetaData != null)
- factory.setFeatures(epMetaData.getFeatures());
-
- return factory;
- }
-
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-03-19 09:52:46 UTC (rev 15996)
@@ -64,7 +64,6 @@
EMPTY_SOAP_BODY_NOT_SUPPORTED=Empty SOAP body with no child element not supported for RPC
NOT_A_SOAPMESSAGE=Not a SOAPMessage: {0}
-ATTACHMENTS_NOT_SUPPORTED_WITH_FASTINFOSET=Attachments not supported with FastInfoset
CANNOT_SERIALIZE_SOAP_ENVELOPE=Cannot serialize SOAP Envelope
PARAMETER_META_DATA_NOT_AVAILABLE=Parameter meta data not available
ENTITY_REFERENCES_ARE_NOT_ALLOWED=Entity References are not allowed in SOAP documents
@@ -103,7 +102,6 @@
UNKNOWN_PROTOCOL=Unknown protocol: {0}
CANNOT_CREATE_DEFAULT_MESSAGE=Cannot create default message when protocol is dynamic
CANNOT_DECODE_MULTIPART_RELATED_MESSAGE=Cannot decode multipart related message
-FASTINFOSET_SUPPORT_IS_NOT_ENABLED=FastInfoset support is not enabled, use FastInfosetFeature to enable it.
UNSUPPORTED_CONTENT_TYPE=Unsupported content type: {0}
COULD_NOT_PARSE_CONTENT_TYPE=Could not parse content type:{0}
CANNOT_OBTAIN_SOAPBODY=Cannot obtain SOAPBody from SOAPMessage
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -48,7 +48,6 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.umdm.FeatureSet;
/**
@@ -265,13 +264,6 @@
soapMessage.setXOPMessage(true);
}
}
- else if (isFastInfosetContent(contentType))
- {
- if (!features.isFeatureEnabled(FastInfosetFeature.class))
- {
- throw new SOAPException(BundleUtils.getMessage(bundle, "FASTINFOSET_SUPPORT_IS_NOT_ENABLED"));
- }
- }
else if (isSoapContent(contentType) == false)
{
throw new SOAPException(BundleUtils.getMessage(bundle, "UNSUPPORTED_CONTENT_TYPE", contentType));
@@ -284,16 +276,7 @@
soapMessage.setAttachments(attachments);
// Get the SOAPEnvelope builder
- EnvelopeBuilder envBuilder;
- if (features.isFeatureEnabled(FastInfosetFeature.class))
- {
- envBuilder = new FastInfosetEnvelopeBuilder();
- }
- else
- {
- //the classloader for jbossws-native-core has enough visibility to get the proper envelope builder
- envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null, this.getClass().getClassLoader());
- }
+ final EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null, this.getClass().getClassLoader());
//if inputstream is empty, no need to build
if (inputStream.markSupported()) {
inputStream.mark(1);
@@ -340,12 +323,6 @@
return MimeConstants.TYPE_SOAP11.equalsIgnoreCase(baseType) || MimeConstants.TYPE_SOAP12.equalsIgnoreCase(baseType);
}
- private boolean isFastInfosetContent(ContentType type)
- {
- String baseType = type.getBaseType();
- return MimeConstants.TYPE_FASTINFOSET.equalsIgnoreCase(baseType);
- }
-
private boolean isMultipartRelatedContent(ContentType type)
{
String baseType = type.getBaseType();
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -61,7 +61,6 @@
import org.jboss.ws.core.soap.attachment.MultipartRelatedSwAEncoder;
import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder;
import org.jboss.ws.extensions.xop.XOPContext;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.w3c.dom.Node;
@@ -363,10 +362,6 @@
contentType = multipartRelatedEncoder.getContentType();
}
}
- else if (msgContext != null && msgContext.getEndpointMetaData().getFeatures().isFeatureEnabled(FastInfosetFeature.class))
- {
- contentType = MimeConstants.TYPE_FASTINFOSET;
- }
//JBWS-2964:Create a new mimeHeaders to avoid changing another referenced mimeHeaders
MimeHeaders newMimeHeaders = new MimeHeaders();
Iterator iterator = mimeHeaders.getAllHeaders();
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -44,7 +44,6 @@
public static final String TYPE_XML_UTF8 = TYPE_TEXT_XML + "; charset=UTF-8";
public static final String TYPE_SOAP11 = TYPE_TEXT_XML;
public static final String TYPE_SOAP12 = "application/soap+xml";
- public static final String TYPE_FASTINFOSET = "application/fastinfoset";
// Encoding
public static final String TEXT_8BIT_ENCODING = "8bit";
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/ChunkedEncodingFeature.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -39,7 +39,7 @@
{
private static final ResourceBundle bundle = BundleUtils.getBundle(ChunkedEncodingFeature.class);
/**
- * Constant value identifying the FastInfosetFeature
+ * Constant value identifying the ChunkedEncodingFeature
*/
public static final String ID = Constants.NS_JBOSSWS_URI + "/features/chunkedencoding";
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1,67 +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.feature;
-
-import javax.xml.ws.WebServiceFeature;
-
-import org.jboss.ws.common.Constants;
-
-/**
- * This feature represents the use of FastInfoset
- *
- * @author Thomas.Diesler at jboss.com
- * @since 29-Feb-2008
- */
-public final class FastInfosetFeature extends WebServiceFeature
-{
- /**
- * Constant value identifying the FastInfosetFeature
- */
- public static final String ID = Constants.NS_JBOSSWS_URI + "/features/fastinfoset";
-
- /**
- * Create an <code>FastInfosetFeature</code>.
- * The instance created will be enabled.
- */
- public FastInfosetFeature()
- {
- this.enabled = true;
- }
-
- /**
- * Creates an <code>FastInfosetFeature</code>.
- *
- * @param enabled specifies if this feature should be enabled or not
- */
- public FastInfosetFeature(boolean enabled)
- {
- this.enabled = enabled;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getID()
- {
- return ID;
- }
-}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -39,12 +39,10 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.annotation.FastInfoset;
import org.jboss.ws.annotation.SchemaValidation;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.DOMWriter;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.feature.SchemaValidationFeature;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
@@ -94,12 +92,6 @@
{
processSchemaValidation(dep, sepMetaData, sepClass);
}
- else if (an.annotationType() == FastInfoset.class)
- {
- FastInfoset anFeature = sepClass.getAnnotation(FastInfoset.class);
- FastInfosetFeature feature = new FastInfosetFeature(anFeature.enabled());
- sepMetaData.addFeature(feature);
- }
else if (an.annotationType() == RespectBinding.class)
{
RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class);
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-19 09:52:46 UTC (rev 15996)
@@ -20,7 +20,6 @@
NO_CLASSLOADER_ASSOCIATED=Deployment has no classloader associated
CANNOT_OBTAIN_ENDPOINTMD=Cannot obtain endpoint meta data
CANNOT_OBTAIN_SOAPPART=Cannot obtain SOAPPart from response message
-NOT_SUPPORTED_WITH_FASTINFOSET=Attachments not supported with FastInfoset
CANNOT_OBTAIN_SEINVOKER=Cannot obtain ServiceEndpointInvoker
CANNOT_PROCESS_METRICS=Cannot process metrics
INVALID_ENDPOINT_ADDRESS=Invalid endpoint address: {0}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-19 09:52:46 UTC (rev 15996)
@@ -81,7 +81,6 @@
import org.jboss.ws.core.utils.ThreadLocalAssociation;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.xop.XOPContext;
-import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
@@ -98,8 +97,6 @@
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.w3c.dom.Document;
-import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer;
-
/**
* A request handler
*
@@ -425,22 +422,7 @@
}
else
{
- // FastInfoset support
- if (epMetaData.isFeatureEnabled(FastInfosetFeature.class) && resMessage instanceof SOAPMessage)
- {
- SOAPMessage soapMessage = (SOAPMessage)resMessage;
- if (soapMessage.getAttachments().hasNext())
- throw new IllegalStateException(BundleUtils.getMessage(bundle, "NOT_SUPPORTED_WITH_FASTINFOSET"));
-
- SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
- DOMDocumentSerializer serializer = new DOMDocumentSerializer();
- serializer.setOutputStream(output);
- serializer.serialize(soapEnv);
- }
- else
- {
- resMessage.writeTo(output);
- }
+ resMessage.writeTo(output);
}
}
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset 2012-03-19 09:52:46 UTC (rev 15996)
@@ -1 +0,0 @@
-org.jboss.ws.core.client.FastInfosetConnectionHTTP
\ No newline at end of file
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -36,7 +36,6 @@
<include>org.jboss.ws.native:jbossws-native-factories:jar</include>
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
<include>org.jboss.ws.native:jbossws-native-core</include>
- <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>javax.jws:jsr181-api:jar</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -31,7 +31,6 @@
<dependencies>
<module name="com.sun.tools.ws" services="import" optional="true"/>
<module name="com.sun.xml.bind" services="import"/>
- <module name="com.sun.xml.fastinfoset" optional="true"/>
<module name="javax.api" />
<module name="javax.servlet.api" />
<module name="javax.jws.api" />
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -118,11 +118,6 @@
<include name="**/policy.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/com/sun/xml/fastinfoset/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/FastInfoset.jar"/>
- </fileset>
- </copy>
<copy todir="@{targetdir}/org/jvnet/staxex/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/stax-ex.jar"/>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -86,16 +86,6 @@
</manifest>
</jar>
- <!-- jaxws-fastinfoset -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-fastinfoset.war" webxml="${tests.output.dir}/test-resources/jaxws/fastinfoset/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.class" />
- </classes>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
<!-- jaxws-handlerlifecycle -->
<war warfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-19 09:34:14 UTC (rev 15995)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-19 09:52:46 UTC (rev 15996)
@@ -80,7 +80,6 @@
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
<netty.version>3.2.6.Final</netty.version>
- <sun.fastinfoset.version>1.2.7</sun.fastinfoset.version>
<sun.jaxws.version>2.2</sun.jaxws.version>
<sun.policy.version>2.0-b01</sun.policy.version>
<stax.api.version>1.0-2</stax.api.version>
@@ -179,11 +178,6 @@
<version>${commons.logging.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- <version>${sun.fastinfoset.version}</version>
- </dependency>
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>policy</artifactId>
<version>${sun.policy.version}</version>
More information about the jbossws-commits
mailing list