[jbossws-commits] JBossWS SVN: r15988 - in stack/native/trunk: modules/core and 18 other directories.

Author: ropalka Date: 2012-03-16 10:06:19 -0400 (Fri, 16 Mar 2012) New Revision: 15988 Removed: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/json/ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/codehaus/jettison/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/jettison/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/json/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/json/ Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/trunk/pom.xml Log: [JBWS-3464] removing json feature Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/pom.xml 2012-03-16 14:06:19 UTC (rev 15988) @@ -130,10 +130,6 @@ <artifactId>jaxws-tools</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - </dependency> - <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> </dependency> Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/JsonEncoding.java 2012-03-16 14:06:19 UTC (rev 15988) @@ -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.JsonEncodingFeature; - -/** - * This feature represents the use of JSON encoding - * - * @author Thomas.Diesler(a)jboss.com - * @since 29-Feb-2008 - */ -@Retention(value = RetentionPolicy.RUNTIME) -@Target(value = { ElementType.TYPE }) -@EndpointFeature(id = JsonEncodingFeature.ID) -@WebServiceFeatureAnnotation(id = JsonEncodingFeature.ID, bean = JsonEncodingFeature.class) -public @interface JsonEncoding { - - /** - * Specifies if the feature is enabled or disabled - */ - boolean enabled() default true; -} Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/JsonConnectionHTTP.java 2012-03-16 14:06:19 UTC (rev 15988) @@ -1,63 +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 javax.xml.soap.SOAPConstants; - -import org.jboss.ws.core.MessageAbstraction; -import org.jboss.ws.core.jaxws.binding.JsonMessageMarshaller; -import org.jboss.ws.core.jaxws.binding.JsonMessageUnMarshaller; -import org.jboss.ws.core.soap.attachment.MimeConstants; - -/** - * JSON remoting connection - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Mar-2008 - */ -public class JsonConnectionHTTP extends HTTPRemotingConnection -{ - public UnMarshaller getUnmarshaller() - { - return new JsonMessageUnMarshaller(); - } - - public Marshaller getMarshaller() - { - return new JsonMessageMarshaller(); - } - - @Override - protected void populateHeaders(MessageAbstraction reqMessage, Map<String, Object> metadata) - { - // TODO: fix the content-type - if (reqMessage != null) - { - MimeHeaders mimeHeaders = reqMessage.getMimeHeaders(); - mimeHeaders.setHeader(MimeConstants.CONTENT_TYPE, SOAPConstants.SOAP_1_1_CONTENT_TYPE); - } - super.populateHeaders(reqMessage, metadata); - } -} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2012-03-16 14:06:19 UTC (rev 15988) @@ -26,7 +26,6 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.api.util.ServiceLoader; import org.jboss.ws.feature.FastInfosetFeature; -import org.jboss.ws.feature.JsonEncodingFeature; /** * A factory for remote connections @@ -55,10 +54,6 @@ { key += ".fastinfoset"; } - else if (epInfo.isFeatureEnabled(JsonEncodingFeature.class)) - { - key += ".json"; - } RemoteConnection con = (RemoteConnection)ServiceLoader.loadService(key, null, this.getClass().getClassLoader()); if (con == null) Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java 2012-03-16 14:06:19 UTC (rev 15988) @@ -1,75 +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.jaxws.binding; - -import java.io.IOException; -import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; -import java.io.OutputStream; - -import javax.xml.soap.SOAPBodyElement; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; - -import org.jboss.ws.core.client.Marshaller; -import org.jboss.ws.core.soap.SOAPBodyImpl; -import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer; - -/** - * @author Thomas.Diesler(a)jboss.org - * @author alessio.soldano(a)jboss.com - * @since 25-Nov-2004 - */ -public class JsonMessageMarshaller implements Marshaller -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(JsonMessageMarshaller.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 - { - // TODO: this should not be a SOAP message - if ((dataObject instanceof SOAPMessageImpl) == false) - throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NOT_A_SOAPMESSAGEIMPL", dataObject)); - - try - { - SOAPMessage soapMessage = (SOAPMessage)dataObject; - SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody(); - SOAPBodyElement payload = soapBody.getBodyElement(); - new BadgerFishDOMDocumentSerializer(output).serialize(payload); - } - catch (SOAPException ex) - { - IOException ioex = new IOException(BundleUtils.getMessage(bundle, "CANNOT_SERIALIZE", dataObject)); - ioex.initCause(ex); - throw ioex; - } - } -} Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java 2012-03-16 14:06:19 UTC (rev 15988) @@ -1,72 +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.jaxws.binding; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; -import java.util.ResourceBundle; - -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.core.client.UnMarshaller; -import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser; -import org.w3c.dom.Document; - -/** - * @author Thomas.Diesler(a)jboss.org - * @since 25-Nov-2004 - */ -public class JsonMessageUnMarshaller implements UnMarshaller -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(JsonMessageUnMarshaller.class); - // Provide logging - private static Logger log = Logger.getLogger(JsonMessageUnMarshaller.class); - - public Object read(InputStream inputStream, Map<String, Object> metadata, Map<String, Object> headers) throws IOException - { - if (log.isTraceEnabled()) - { - log.trace("Read input stream with metadata=" + metadata); - } - - // TODO: this should not be a SOAP message - try - { - MessageFactoryImpl factory = new MessageFactoryImpl(); - SOAPMessage soapMsg = factory.createMessage(); - Document doc = new BadgerFishDOMDocumentParser().parse(inputStream); - soapMsg.getSOAPBody().addDocument(doc); - return soapMsg; - } - catch (SOAPException ex) - { - IOException ioex = new IOException(BundleUtils.getMessage(bundle, "CANNOT_UNMARSHALL_JSON_INPUT_STREAM")); - ioex.initCause(ex); - throw ioex; - } - } -} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/Message.properties 2012-03-16 14:06:19 UTC (rev 15988) @@ -5,7 +5,6 @@ CANNOT_SERIALIZE=Cannot serialize: {0} CANNOT_SET_FAULT_MESSAGE_IN_MESSAGE_CONTEXT=Cannot set fault message in message context NOT_A_HTTPMESSAGE=Not a HTTPMessage: {0} -CANNOT_UNMARSHALL_JSON_INPUT_STREAM=Cannot unmarshall json input stream UNSUPPORTED_BINDING=Unsupported binding: {0} INVALID_HTTP_SERVER_RESPONSE=Invalid HTTP server response [{0}] - {1} NONE_ROLE=Attempt to configure the binding to play the none role Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-16 14:06:19 UTC (rev 15988) @@ -42,7 +42,6 @@ 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.JsonEncodingFeature; import org.jboss.ws.feature.SchemaValidationFeature; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData; @@ -72,7 +71,6 @@ static { supportedFeatures.addFeature(new FastInfosetFeature()); - supportedFeatures.addFeature(new JsonEncodingFeature()); supportedFeatures.addFeature(new SchemaValidationFeature()); supportedFeatures.addFeature(new AddressingFeature()); supportedFeatures.addFeature(new MTOMFeature()); Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/feature/JsonEncodingFeature.java 2012-03-16 14:06:19 UTC (rev 15988) @@ -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 JSON encoding - * - * @author Thomas.Diesler(a)jboss.com - * @since 29-Feb-2008 - */ -public final class JsonEncodingFeature extends WebServiceFeature -{ - /** - * Constant value identifying the JSON encoding feature - */ - public static final String ID = Constants.NS_JBOSSWS_URI + "/features/json"; - - /** - * Create an <code>JsonFeature</code>. - * The instance created will be enabled. - */ - public JsonEncodingFeature() - { - this.enabled = true; - } - - /** - * Creates an <code>JsonFeature</code>. - * - * @param enabled specifies if this feature should be enabled or not - */ - public JsonEncodingFeature(boolean enabled) - { - this.enabled = enabled; - } - - /** - * {@inheritDoc} - */ - public String getID() - { - return ID; - } -} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-16 14:06:19 UTC (rev 15988) @@ -40,13 +40,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.annotation.FastInfoset; -import org.jboss.ws.annotation.JsonEncoding; 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.JsonEncodingFeature; import org.jboss.ws.feature.SchemaValidationFeature; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; @@ -102,12 +100,6 @@ FastInfosetFeature feature = new FastInfosetFeature(anFeature.enabled()); sepMetaData.addFeature(feature); } - else if (an.annotationType() == JsonEncoding.class) - { - JsonEncoding anFeature = sepClass.getAnnotation(JsonEncoding.class); - JsonEncodingFeature feature = new JsonEncodingFeature(anFeature.enabled()); - sepMetaData.addFeature(feature); - } else if (an.annotationType() == RespectBinding.class) { RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class); @@ -234,7 +226,7 @@ feature.setSchemaLocation(xsdLoc); } - Class handlerClass = anFeature.errorHandler(); + Class<?> handlerClass = anFeature.errorHandler(); if (handlerClass != null) { try Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/Message.properties 2012-03-16 14:06:19 UTC (rev 15988) @@ -21,7 +21,6 @@ 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 -NOT_SUPPORTED_WITH_JSON=Attachments not supported with JSON CANNOT_OBTAIN_SEINVOKER=Cannot obtain ServiceEndpointInvoker CANNOT_PROCESS_METRICS=Cannot process metrics INVALID_ENDPOINT_ADDRESS=Invalid endpoint address: {0} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-16 14:06:19 UTC (rev 15988) @@ -76,16 +76,12 @@ import org.jboss.ws.core.server.WSDLRequestHandler; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPConnectionImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.utils.ThreadLocalAssociation; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser; -import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.feature.FastInfosetFeature; -import org.jboss.ws.feature.JsonEncodingFeature; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -441,17 +437,6 @@ serializer.setOutputStream(output); serializer.serialize(soapEnv); } - // JSON support - else if (epMetaData.isFeatureEnabled(JsonEncodingFeature.class) && resMessage instanceof SOAPMessage) - { - SOAPMessage soapMessage = (SOAPMessage)resMessage; - if (soapMessage.getAttachments().hasNext()) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "NOT_SUPPORTED_WITH_JSON")); - - SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody(); - BadgerFishDOMDocumentSerializer serializer = new BadgerFishDOMDocumentSerializer(output); - serializer.serialize(soapBody.getBodyElement()); - } else { resMessage.writeTo(output); @@ -495,14 +480,6 @@ { reqMessage = new HTTPMessageImpl(headers, inputStream); } - else if (sepMetaData.isFeatureEnabled(JsonEncodingFeature.class)) - { - MessageFactoryImpl factory = new MessageFactoryImpl(); - SOAPMessageImpl soapMsg = (SOAPMessageImpl)factory.createMessage(); - Document doc = new BadgerFishDOMDocumentParser().parse(inputStream); - soapMsg.getSOAPBody().addDocument(doc); - reqMessage = soapMsg; - } else { msgFactory.setServiceMode(sepMetaData.getServiceMode()); Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.json 2012-03-16 14:06:19 UTC (rev 15988) @@ -1 +0,0 @@ -org.jboss.ws.core.client.JsonConnectionHTTP \ No newline at end of file Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-16 14:06:19 UTC (rev 15988) @@ -46,7 +46,6 @@ <include>org.jboss.ws:jbossws-api:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> - <include>org.codehaus.jettison:jettison:jar</include> <include>com.sun.xml.ws:policy:jar</include> <include>javax.xml.stream:stax-api:jar</include> <include>org.jvnet.staxex:stax-ex:jar</include> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 14:06:19 UTC (rev 15988) @@ -46,7 +46,6 @@ <module name="org.apache.santuario.xmlsec" /> <module name="org.apache.ws.commons.policy" optional="true"/> <module name="org.javassist" /> - <module name="org.codehaus.jettison" optional="true"/> <module name="org.jboss.netty" /> <module name="org.jboss.xb" /> <module name="org.jboss.ws.api" /> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-16 14:06:19 UTC (rev 15988) @@ -46,7 +46,6 @@ <module name="org.apache.santuario.xmlsec" /> <module name="org.apache.ws.commons.policy" optional="true"/> <module name="org.javassist" /> - <module name="org.codehaus.jettison" optional="true"/> <module name="org.jboss.netty" /> <module name="org.jboss.xb" /> <module name="org.jboss.ws.api" /> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-16 14:06:19 UTC (rev 15988) @@ -128,11 +128,6 @@ <include name="**/stax-ex.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/codehaus/jettison/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jettison.jar"/> - </fileset> - </copy> <copy todir="@{targetdir}/org/jboss/jaxbintros/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jboss-jaxb-intros.jar"/> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-16 14:06:19 UTC (rev 15988) @@ -119,16 +119,6 @@ </metainf> </jar> - <!-- jaxws-json --> - <war warfile="${tests.output.dir}/test-libs/jaxws-json.war" webxml="${tests.output.dir}/test-resources/jaxws/json/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/json/JsonEndpoint.class" /> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - <!-- jaxws-jaxbintros --> <war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-03-16 12:14:06 UTC (rev 15987) +++ stack/native/trunk/pom.xml 2012-03-16 14:06:19 UTC (rev 15988) @@ -74,7 +74,6 @@ <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <ant.version>1.7.1</ant.version> - <codehaus.jettison.version>1.3.1</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> <javassist.version>3.15.0-GA</javassist.version> <jaxws.api.version>2.0.0.Final</jaxws.api.version> @@ -364,11 +363,6 @@ <version>${stax.api.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>${codehaus.jettison.version}</version> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> <version>${jboss.logging.version}</version>